From b9750dad90805ab9064b083f792c0c680759708a Mon Sep 17 00:00:00 2001 From: tb <> Date: Thu, 30 Jun 2022 11:14:47 +0000 Subject: Replace obj_mac.h with object.h Pointed out by and ok jsing --- src/lib/libcrypto/ec/ec_curve.c | 7 ++++--- src/lib/libcrypto/ec/ec_lcl.h | 6 +++--- src/lib/libcrypto/ec/ecp_nist.c | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/lib/libcrypto/ec') diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c index b575f7bac2..09f8cfe9d8 100644 --- a/src/lib/libcrypto/ec/ec_curve.c +++ b/src/lib/libcrypto/ec/ec_curve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_curve.c,v 1.21 2021/04/20 17:16:37 tb Exp $ */ +/* $OpenBSD: ec_curve.c,v 1.22 2022/06/30 11:14:47 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -73,9 +73,10 @@ #include -#include "ec_lcl.h" #include -#include +#include + +#include "ec_lcl.h" typedef struct { int field_type, /* either NID_X9_62_prime_field or diff --git a/src/lib/libcrypto/ec/ec_lcl.h b/src/lib/libcrypto/ec/ec_lcl.h index 7a7469968c..f0a5618be2 100644 --- a/src/lib/libcrypto/ec/ec_lcl.h +++ b/src/lib/libcrypto/ec/ec_lcl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_lcl.h,v 1.19 2021/12/04 16:08:32 tb Exp $ */ +/* $OpenBSD: ec_lcl.h,v 1.20 2022/06/30 11:14:47 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -71,10 +71,10 @@ #include -#include +#include #include #include -#include +#include #include "bn_lcl.h" diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c index f7dae16e47..b3cea0c4c0 100644 --- a/src/lib/libcrypto/ec/ecp_nist.c +++ b/src/lib/libcrypto/ec/ecp_nist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nist.c,v 1.18 2021/09/08 17:29:21 tb Exp $ */ +/* $OpenBSD: ecp_nist.c,v 1.19 2022/06/30 11:14:47 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -64,7 +64,8 @@ #include #include -#include +#include + #include "ec_lcl.h" const EC_METHOD * -- cgit v1.2.3-55-g6feb