summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/ec')
-rw-r--r--src/lib/libcrypto/ec/ec2_mult.c6
-rw-r--r--src/lib/libcrypto/ec/ec2_oct.c4
-rw-r--r--src/lib/libcrypto/ec/ec2_smpl.c4
-rw-r--r--src/lib/libcrypto/ec/ec_ameth.c8
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c6
-rw-r--r--src/lib/libcrypto/ec/ec_check.c4
-rw-r--r--src/lib/libcrypto/ec/ec_curve.c4
-rw-r--r--src/lib/libcrypto/ec/ec_cvt.c4
-rw-r--r--src/lib/libcrypto/ec/ec_key.c6
-rw-r--r--src/lib/libcrypto/ec/ec_kmeth.c8
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c6
-rw-r--r--src/lib/libcrypto/ec/ec_local.h (renamed from src/lib/libcrypto/ec/ec_lcl.h)4
-rw-r--r--src/lib/libcrypto/ec/ec_mult.c4
-rw-r--r--src/lib/libcrypto/ec/ec_oct.c4
-rw-r--r--src/lib/libcrypto/ec/ec_pmeth.c10
-rw-r--r--src/lib/libcrypto/ec/ec_print.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_mont.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nist.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp224.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp256.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp521.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nistputil.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nistz256.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_oct.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_smpl.c6
-rw-r--r--src/lib/libcrypto/ec/ecx_methods.c6
26 files changed, 65 insertions, 65 deletions
diff --git a/src/lib/libcrypto/ec/ec2_mult.c b/src/lib/libcrypto/ec/ec2_mult.c
index c44ac5c3db..8b8aaf7122 100644
--- a/src/lib/libcrypto/ec/ec2_mult.c
+++ b/src/lib/libcrypto/ec/ec2_mult.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec2_mult.c,v 1.14 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec2_mult.c,v 1.15 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -71,8 +71,8 @@
71 71
72#include <openssl/err.h> 72#include <openssl/err.h>
73 73
74#include "bn_lcl.h" 74#include "bn_local.h"
75#include "ec_lcl.h" 75#include "ec_local.h"
76 76
77#ifndef OPENSSL_NO_EC2M 77#ifndef OPENSSL_NO_EC2M
78 78
diff --git a/src/lib/libcrypto/ec/ec2_oct.c b/src/lib/libcrypto/ec/ec2_oct.c
index be29203292..d3fbc12749 100644
--- a/src/lib/libcrypto/ec/ec2_oct.c
+++ b/src/lib/libcrypto/ec/ec2_oct.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec2_oct.c,v 1.18 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec2_oct.c,v 1.19 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -71,7 +71,7 @@
71 71
72#include <openssl/err.h> 72#include <openssl/err.h>
73 73
74#include "ec_lcl.h" 74#include "ec_local.h"
75 75
76#ifndef OPENSSL_NO_EC2M 76#ifndef OPENSSL_NO_EC2M
77 77
diff --git a/src/lib/libcrypto/ec/ec2_smpl.c b/src/lib/libcrypto/ec/ec2_smpl.c
index b4d7f5db2e..3ab7a1d46a 100644
--- a/src/lib/libcrypto/ec/ec2_smpl.c
+++ b/src/lib/libcrypto/ec/ec2_smpl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec2_smpl.c,v 1.27 2022/11/24 01:30:01 jsing Exp $ */ 1/* $OpenBSD: ec2_smpl.c,v 1.28 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 3 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
4 * 4 *
@@ -71,7 +71,7 @@
71 71
72#include <openssl/err.h> 72#include <openssl/err.h>
73 73
74#include "ec_lcl.h" 74#include "ec_local.h"
75 75
76#ifndef OPENSSL_NO_EC2M 76#ifndef OPENSSL_NO_EC2M
77 77
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index b6f21ade63..d9216cc451 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_ameth.c,v 1.35 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_ameth.c,v 1.36 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -66,9 +66,9 @@
66#include <openssl/err.h> 66#include <openssl/err.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69#include "asn1_locl.h" 69#include "asn1_local.h"
70#include "ec_lcl.h" 70#include "ec_local.h"
71#include "evp_locl.h" 71#include "evp_local.h"
72 72
73#ifndef OPENSSL_NO_CMS 73#ifndef OPENSSL_NO_CMS
74static int ecdh_cms_decrypt(CMS_RecipientInfo *ri); 74static int ecdh_cms_decrypt(CMS_RecipientInfo *ri);
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 974afffe78..2d7a1d4c3b 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_asn1.c,v 1.39 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.40 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -64,8 +64,8 @@
64#include <openssl/asn1t.h> 64#include <openssl/asn1t.h>
65#include <openssl/objects.h> 65#include <openssl/objects.h>
66 66
67#include "asn1_locl.h" 67#include "asn1_local.h"
68#include "ec_lcl.h" 68#include "ec_local.h"
69 69
70int 70int
71EC_GROUP_get_basis_type(const EC_GROUP *group) 71EC_GROUP_get_basis_type(const EC_GROUP *group)
diff --git a/src/lib/libcrypto/ec/ec_check.c b/src/lib/libcrypto/ec/ec_check.c
index cc54ded3e7..5c6165e129 100644
--- a/src/lib/libcrypto/ec/ec_check.c
+++ b/src/lib/libcrypto/ec/ec_check.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_check.c,v 1.11 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_check.c,v 1.12 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -53,7 +53,7 @@
53 * 53 *
54 */ 54 */
55 55
56#include "ec_lcl.h" 56#include "ec_local.h"
57#include <openssl/err.h> 57#include <openssl/err.h>
58 58
59int 59int
diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c
index 592a367a82..4a6ee895d2 100644
--- a/src/lib/libcrypto/ec/ec_curve.c
+++ b/src/lib/libcrypto/ec/ec_curve.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_curve.c,v 1.24 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_curve.c,v 1.25 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -76,7 +76,7 @@
76#include <openssl/err.h> 76#include <openssl/err.h>
77#include <openssl/objects.h> 77#include <openssl/objects.h>
78 78
79#include "ec_lcl.h" 79#include "ec_local.h"
80 80
81typedef struct { 81typedef struct {
82 int field_type, /* either NID_X9_62_prime_field or 82 int field_type, /* either NID_X9_62_prime_field or
diff --git a/src/lib/libcrypto/ec/ec_cvt.c b/src/lib/libcrypto/ec/ec_cvt.c
index 05c7dd1bf1..365ca1aa7e 100644
--- a/src/lib/libcrypto/ec/ec_cvt.c
+++ b/src/lib/libcrypto/ec/ec_cvt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_cvt.c,v 1.7 2021/04/20 17:04:13 tb Exp $ */ 1/* $OpenBSD: ec_cvt.c,v 1.8 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -72,7 +72,7 @@
72#include <openssl/opensslconf.h> 72#include <openssl/opensslconf.h>
73 73
74#include <openssl/err.h> 74#include <openssl/err.h>
75#include "ec_lcl.h" 75#include "ec_local.h"
76 76
77EC_GROUP * 77EC_GROUP *
78EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, 78EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b,
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index fa8d463220..bad4779ed1 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_key.c,v 1.28 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_key.c,v 1.29 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -70,8 +70,8 @@
70#endif 70#endif
71#include <openssl/err.h> 71#include <openssl/err.h>
72 72
73#include "bn_lcl.h" 73#include "bn_local.h"
74#include "ec_lcl.h" 74#include "ec_local.h"
75 75
76EC_KEY * 76EC_KEY *
77EC_KEY_new(void) 77EC_KEY_new(void)
diff --git a/src/lib/libcrypto/ec/ec_kmeth.c b/src/lib/libcrypto/ec/ec_kmeth.c
index 4203dff2d0..56fb437093 100644
--- a/src/lib/libcrypto/ec/ec_kmeth.c
+++ b/src/lib/libcrypto/ec/ec_kmeth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_kmeth.c,v 1.6 2021/12/04 16:08:32 tb Exp $ */ 1/* $OpenBSD: ec_kmeth.c,v 1.7 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
4 * project. 4 * project.
@@ -58,9 +58,9 @@
58#endif 58#endif
59#include <openssl/err.h> 59#include <openssl/err.h>
60 60
61#include "bn_lcl.h" 61#include "bn_local.h"
62#include "ec_lcl.h" 62#include "ec_local.h"
63#include "ecs_locl.h" 63#include "ecs_local.h"
64 64
65static const EC_KEY_METHOD openssl_ec_key_method = { 65static const EC_KEY_METHOD openssl_ec_key_method = {
66 .name = "OpenSSL EC_KEY method", 66 .name = "OpenSSL EC_KEY method",
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index 151e91b36c..5ad535f7ec 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_lib.c,v 1.46 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.47 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -68,8 +68,8 @@
68#include <openssl/err.h> 68#include <openssl/err.h>
69#include <openssl/opensslv.h> 69#include <openssl/opensslv.h>
70 70
71#include "bn_lcl.h" 71#include "bn_local.h"
72#include "ec_lcl.h" 72#include "ec_local.h"
73 73
74/* functions for EC_GROUP objects */ 74/* functions for EC_GROUP objects */
75 75
diff --git a/src/lib/libcrypto/ec/ec_lcl.h b/src/lib/libcrypto/ec/ec_local.h
index e8bac0ac0e..5fc9bfebbb 100644
--- a/src/lib/libcrypto/ec/ec_lcl.h
+++ b/src/lib/libcrypto/ec/ec_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_lcl.h,v 1.23 2022/11/24 16:29:09 tb Exp $ */ 1/* $OpenBSD: ec_local.h,v 1.1 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -76,7 +76,7 @@
76#include <openssl/ecdsa.h> 76#include <openssl/ecdsa.h>
77#include <openssl/objects.h> 77#include <openssl/objects.h>
78 78
79#include "bn_lcl.h" 79#include "bn_local.h"
80 80
81__BEGIN_HIDDEN_DECLS 81__BEGIN_HIDDEN_DECLS
82 82
diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c
index a3da62323a..4b50184ff6 100644
--- a/src/lib/libcrypto/ec/ec_mult.c
+++ b/src/lib/libcrypto/ec/ec_mult.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_mult.c,v 1.26 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_mult.c,v 1.27 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project. 3 * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -65,7 +65,7 @@
65 65
66#include <openssl/err.h> 66#include <openssl/err.h>
67 67
68#include "ec_lcl.h" 68#include "ec_local.h"
69 69
70 70
71/* 71/*
diff --git a/src/lib/libcrypto/ec/ec_oct.c b/src/lib/libcrypto/ec/ec_oct.c
index 45968219de..0e651991fd 100644
--- a/src/lib/libcrypto/ec/ec_oct.c
+++ b/src/lib/libcrypto/ec/ec_oct.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_oct.c,v 1.8 2021/04/20 17:34:33 tb Exp $ */ 1/* $OpenBSD: ec_oct.c,v 1.9 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -68,7 +68,7 @@
68#include <openssl/err.h> 68#include <openssl/err.h>
69#include <openssl/opensslv.h> 69#include <openssl/opensslv.h>
70 70
71#include "ec_lcl.h" 71#include "ec_local.h"
72 72
73int 73int
74EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point, 74EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
diff --git a/src/lib/libcrypto/ec/ec_pmeth.c b/src/lib/libcrypto/ec/ec_pmeth.c
index 80c09b1e21..9582224037 100644
--- a/src/lib/libcrypto/ec/ec_pmeth.c
+++ b/src/lib/libcrypto/ec/ec_pmeth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_pmeth.c,v 1.15 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_pmeth.c,v 1.16 2022/11/26 16:08:52 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -66,10 +66,10 @@
66#include <openssl/evp.h> 66#include <openssl/evp.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69#include "bn_lcl.h" 69#include "bn_local.h"
70#include "ec_lcl.h" 70#include "ec_local.h"
71#include "ech_locl.h" 71#include "ech_local.h"
72#include "evp_locl.h" 72#include "evp_local.h"
73 73
74/* EC pkey context structure */ 74/* EC pkey context structure */
75 75
diff --git a/src/lib/libcrypto/ec/ec_print.c b/src/lib/libcrypto/ec/ec_print.c
index 18d7a7a01f..1b85e82436 100644
--- a/src/lib/libcrypto/ec/ec_print.c
+++ b/src/lib/libcrypto/ec/ec_print.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_print.c,v 1.8 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ec_print.c,v 1.9 2022/11/26 16:08:52 tb Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -54,7 +54,7 @@
54 */ 54 */
55 55
56#include <openssl/crypto.h> 56#include <openssl/crypto.h>
57#include "ec_lcl.h" 57#include "ec_local.h"
58 58
59BIGNUM * 59BIGNUM *
60EC_POINT_point2bn(const EC_GROUP *group, const EC_POINT *point, 60EC_POINT_point2bn(const EC_GROUP *group, const EC_POINT *point,
diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index da6d2f1cf0..74204ed39a 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_mont.c,v 1.21 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ecp_mont.c,v 1.22 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -63,7 +63,7 @@
63 63
64#include <openssl/err.h> 64#include <openssl/err.h>
65 65
66#include "ec_lcl.h" 66#include "ec_local.h"
67 67
68 68
69const EC_METHOD * 69const EC_METHOD *
diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c
index d3cb4f37b7..cf00d3b11d 100644
--- a/src/lib/libcrypto/ec/ecp_nist.c
+++ b/src/lib/libcrypto/ec/ecp_nist.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_nist.c,v 1.20 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ecp_nist.c,v 1.21 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -66,7 +66,7 @@
66#include <openssl/err.h> 66#include <openssl/err.h>
67#include <openssl/objects.h> 67#include <openssl/objects.h>
68 68
69#include "ec_lcl.h" 69#include "ec_local.h"
70 70
71const EC_METHOD * 71const EC_METHOD *
72EC_GFp_nist_method(void) 72EC_GFp_nist_method(void)
diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c
index 70944c463d..59781b75c3 100644
--- a/src/lib/libcrypto/ec/ecp_nistp224.c
+++ b/src/lib/libcrypto/ec/ecp_nistp224.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_nistp224.c,v 1.28 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ecp_nistp224.c,v 1.29 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Emilia Kasper (Google) for the OpenSSL project. 3 * Written by Emilia Kasper (Google) for the OpenSSL project.
4 */ 4 */
@@ -33,7 +33,7 @@
33#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 33#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
34 34
35#include <openssl/err.h> 35#include <openssl/err.h>
36#include "ec_lcl.h" 36#include "ec_local.h"
37 37
38#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) 38#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
39 /* even with gcc, the typedef won't work for 32-bit platforms */ 39 /* even with gcc, the typedef won't work for 32-bit platforms */
diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c
index 8371ee4827..275015b98d 100644
--- a/src/lib/libcrypto/ec/ecp_nistp256.c
+++ b/src/lib/libcrypto/ec/ecp_nistp256.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_nistp256.c,v 1.27 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ecp_nistp256.c,v 1.28 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
@@ -34,7 +34,7 @@
34#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 34#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
35 35
36#include <openssl/err.h> 36#include <openssl/err.h>
37#include "ec_lcl.h" 37#include "ec_local.h"
38 38
39#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) 39#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
40 /* even with gcc, the typedef won't work for 32-bit platforms */ 40 /* even with gcc, the typedef won't work for 32-bit platforms */
diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c
index 064bf85534..20b5885ab7 100644
--- a/src/lib/libcrypto/ec/ecp_nistp521.c
+++ b/src/lib/libcrypto/ec/ecp_nistp521.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_nistp521.c,v 1.28 2022/11/19 07:29:29 tb Exp $ */ 1/* $OpenBSD: ecp_nistp521.c,v 1.29 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
@@ -34,7 +34,7 @@
34#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 34#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
35 35
36#include <openssl/err.h> 36#include <openssl/err.h>
37#include "ec_lcl.h" 37#include "ec_local.h"
38 38
39#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) 39#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
40 /* even with gcc, the typedef won't work for 32-bit platforms */ 40 /* even with gcc, the typedef won't work for 32-bit platforms */
diff --git a/src/lib/libcrypto/ec/ecp_nistputil.c b/src/lib/libcrypto/ec/ecp_nistputil.c
index fc4f9f5c26..d0fea12028 100644
--- a/src/lib/libcrypto/ec/ecp_nistputil.c
+++ b/src/lib/libcrypto/ec/ecp_nistputil.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_nistputil.c,v 1.7 2022/11/19 07:00:57 tb Exp $ */ 1/* $OpenBSD: ecp_nistputil.c,v 1.8 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Written by Bodo Moeller for the OpenSSL project. 3 * Written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -28,7 +28,7 @@
28 * Common utility functions for ecp_nistp224.c, ecp_nistp256.c, ecp_nistp521.c. 28 * Common utility functions for ecp_nistp224.c, ecp_nistp256.c, ecp_nistp521.c.
29 */ 29 */
30 30
31#include "ec_lcl.h" 31#include "ec_local.h"
32 32
33/* Convert an array of points into affine coordinates. 33/* Convert an array of points into affine coordinates.
34 * (If the point at infinity is found (Z = 0), it remains unchanged.) 34 * (If the point at infinity is found (Z = 0), it remains unchanged.)
diff --git a/src/lib/libcrypto/ec/ecp_nistz256.c b/src/lib/libcrypto/ec/ecp_nistz256.c
index e3a6cc855a..62aac44c64 100644
--- a/src/lib/libcrypto/ec/ecp_nistz256.c
+++ b/src/lib/libcrypto/ec/ecp_nistz256.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_nistz256.c,v 1.13 2022/11/24 01:30:01 jsing Exp $ */ 1/* $OpenBSD: ecp_nistz256.c,v 1.14 2022/11/26 16:08:52 tb Exp $ */
2/* Copyright (c) 2014, Intel Corporation. 2/* Copyright (c) 2014, Intel Corporation.
3 * 3 *
4 * Permission to use, copy, modify, and/or distribute this software for any 4 * Permission to use, copy, modify, and/or distribute this software for any
@@ -46,7 +46,7 @@
46#include <openssl/ec.h> 46#include <openssl/ec.h>
47#include <openssl/err.h> 47#include <openssl/err.h>
48 48
49#include "ec_lcl.h" 49#include "ec_local.h"
50 50
51#if BN_BITS2 != 64 51#if BN_BITS2 != 64
52#define TOBN(hi,lo) lo,hi 52#define TOBN(hi,lo) lo,hi
diff --git a/src/lib/libcrypto/ec/ecp_oct.c b/src/lib/libcrypto/ec/ecp_oct.c
index 354ae5489d..f2f1929e84 100644
--- a/src/lib/libcrypto/ec/ecp_oct.c
+++ b/src/lib/libcrypto/ec/ecp_oct.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_oct.c,v 1.18 2022/11/24 16:35:32 tb Exp $ */ 1/* $OpenBSD: ecp_oct.c,v 1.19 2022/11/26 16:08:52 tb Exp $ */
2/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de> 2/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
3 * for the OpenSSL project. 3 * for the OpenSSL project.
4 * Includes code written by Bodo Moeller for the OpenSSL project. 4 * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -64,7 +64,7 @@
64 64
65#include <openssl/err.h> 65#include <openssl/err.h>
66 66
67#include "ec_lcl.h" 67#include "ec_local.h"
68 68
69int 69int
70ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, 70ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group,
diff --git a/src/lib/libcrypto/ec/ecp_smpl.c b/src/lib/libcrypto/ec/ecp_smpl.c
index 71d403b854..dc3b3926d1 100644
--- a/src/lib/libcrypto/ec/ecp_smpl.c
+++ b/src/lib/libcrypto/ec/ecp_smpl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecp_smpl.c,v 1.37 2022/11/24 01:30:01 jsing Exp $ */ 1/* $OpenBSD: ecp_smpl.c,v 1.38 2022/11/26 16:08:52 tb Exp $ */
2/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de> 2/* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
3 * for the OpenSSL project. 3 * for the OpenSSL project.
4 * Includes code written by Bodo Moeller for the OpenSSL project. 4 * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -64,8 +64,8 @@
64 64
65#include <openssl/err.h> 65#include <openssl/err.h>
66 66
67#include "bn_lcl.h" 67#include "bn_local.h"
68#include "ec_lcl.h" 68#include "ec_local.h"
69 69
70const EC_METHOD * 70const EC_METHOD *
71EC_GFp_simple_method(void) 71EC_GFp_simple_method(void)
diff --git a/src/lib/libcrypto/ec/ecx_methods.c b/src/lib/libcrypto/ec/ecx_methods.c
index 4de7f1565e..26fef18381 100644
--- a/src/lib/libcrypto/ec/ecx_methods.c
+++ b/src/lib/libcrypto/ec/ecx_methods.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecx_methods.c,v 1.3 2022/11/23 07:37:06 tb Exp $ */ 1/* $OpenBSD: ecx_methods.c,v 1.4 2022/11/26 16:08:52 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -23,10 +23,10 @@
23#include <openssl/evp.h> 23#include <openssl/evp.h>
24#include <openssl/x509.h> 24#include <openssl/x509.h>
25 25
26#include "asn1_locl.h" 26#include "asn1_local.h"
27#include "bytestring.h" 27#include "bytestring.h"
28#include "curve25519_internal.h" 28#include "curve25519_internal.h"
29#include "evp_locl.h" 29#include "evp_local.h"
30 30
31/* 31/*
32 * EVP PKEY and PKEY ASN.1 methods Ed25519 and X25519. 32 * EVP PKEY and PKEY ASN.1 methods Ed25519 and X25519.