diff options
author | tb <> | 2022-11-26 16:08:57 +0000 |
---|---|---|
committer | tb <> | 2022-11-26 16:08:57 +0000 |
commit | d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49 (patch) | |
tree | 556ebf909e81599dc3d8da585217d1576eabe0e4 /src/lib/libcrypto/ecdsa | |
parent | bcbac728558eebfaa4404c405e7dc22769585345 (diff) | |
download | openbsd-d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49.tar.gz openbsd-d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49.tar.bz2 openbsd-d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49.zip |
Make internal header file names consistent
Libcrypto currently has a mess of *_lcl.h, *_locl.h, and *_local.h names
used for internal headers. Move all these headers we inherited from
OpenSSL to *_local.h, reserving the name *_internal.h for our own code.
Similarly, move dtls_locl.h and ssl_locl.h to dtls_local and ssl_local.h.
constant_time_locl.h is moved to constant_time.h since it's special.
Adjust all .c files in libcrypto, libssl and regress.
The diff is mechanical with the exception of tls13_quic.c, where
#include <ssl_locl.h> was fixed manually.
discussed with jsing,
no objection bcook
Diffstat (limited to 'src/lib/libcrypto/ecdsa')
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_asn1.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_lib.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_local.h (renamed from src/lib/libcrypto/ecdsa/ecs_locl.h) | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_ossl.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_sign.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/ecdsa/ecs_vrf.c | 8 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/libcrypto/ecdsa/ecs_asn1.c b/src/lib/libcrypto/ecdsa/ecs_asn1.c index d4cbf1e308..9e286138e8 100644 --- a/src/lib/libcrypto/ecdsa/ecs_asn1.c +++ b/src/lib/libcrypto/ecdsa/ecs_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecs_asn1.c,v 1.11 2022/09/03 16:01:23 jsing Exp $ */ | 1 | /* $OpenBSD: ecs_asn1.c,v 1.12 2022/11/26 16:08:52 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -53,7 +53,7 @@ | |||
53 | * | 53 | * |
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include "ecs_locl.h" | 56 | #include "ecs_local.h" |
57 | #include <openssl/err.h> | 57 | #include <openssl/err.h> |
58 | #include <openssl/asn1t.h> | 58 | #include <openssl/asn1t.h> |
59 | 59 | ||
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c index 18eecba704..5e95c5ed60 100644 --- a/src/lib/libcrypto/ecdsa/ecs_lib.c +++ b/src/lib/libcrypto/ecdsa/ecs_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecs_lib.c,v 1.14 2022/08/31 13:01:01 tb Exp $ */ | 1 | /* $OpenBSD: ecs_lib.c,v 1.15 2022/11/26 16:08:52 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | #include <openssl/opensslconf.h> | 58 | #include <openssl/opensslconf.h> |
59 | 59 | ||
60 | #include "ecs_locl.h" | 60 | #include "ecs_local.h" |
61 | #ifndef OPENSSL_NO_ENGINE | 61 | #ifndef OPENSSL_NO_ENGINE |
62 | #include <openssl/engine.h> | 62 | #include <openssl/engine.h> |
63 | #endif | 63 | #endif |
diff --git a/src/lib/libcrypto/ecdsa/ecs_locl.h b/src/lib/libcrypto/ecdsa/ecs_local.h index a53ec379ea..69794dfefb 100644 --- a/src/lib/libcrypto/ecdsa/ecs_locl.h +++ b/src/lib/libcrypto/ecdsa/ecs_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecs_locl.h,v 1.7 2022/01/14 08:31:03 tb Exp $ */ | 1 | /* $OpenBSD: ecs_local.h,v 1.1 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 | */ |
diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c index 48ef131217..eec757ef7c 100644 --- a/src/lib/libcrypto/ecdsa/ecs_ossl.c +++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecs_ossl.c,v 1.25 2022/06/30 11:14:47 tb Exp $ */ | 1 | /* $OpenBSD: ecs_ossl.c,v 1.26 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/err.h> | 64 | #include <openssl/err.h> |
65 | #include <openssl/objects.h> | 65 | #include <openssl/objects.h> |
66 | 66 | ||
67 | #include "bn_lcl.h" | 67 | #include "bn_local.h" |
68 | #include "ecs_locl.h" | 68 | #include "ecs_local.h" |
69 | 69 | ||
70 | static int ecdsa_prepare_digest(const unsigned char *dgst, int dgst_len, | 70 | static int ecdsa_prepare_digest(const unsigned char *dgst, int dgst_len, |
71 | BIGNUM *order, BIGNUM *ret); | 71 | BIGNUM *order, BIGNUM *ret); |
diff --git a/src/lib/libcrypto/ecdsa/ecs_sign.c b/src/lib/libcrypto/ecdsa/ecs_sign.c index 6424a3ca60..9aab20b0da 100644 --- a/src/lib/libcrypto/ecdsa/ecs_sign.c +++ b/src/lib/libcrypto/ecdsa/ecs_sign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecs_sign.c,v 1.9 2022/01/27 20:30:29 tb Exp $ */ | 1 | /* $OpenBSD: ecs_sign.c,v 1.10 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 | * |
@@ -61,9 +61,9 @@ | |||
61 | #include <openssl/err.h> | 61 | #include <openssl/err.h> |
62 | #include <openssl/evp.h> | 62 | #include <openssl/evp.h> |
63 | 63 | ||
64 | #include "bn_lcl.h" | 64 | #include "bn_local.h" |
65 | #include "ecs_locl.h" | 65 | #include "ecs_local.h" |
66 | #include "ec_lcl.h" | 66 | #include "ec_local.h" |
67 | 67 | ||
68 | ECDSA_SIG * | 68 | ECDSA_SIG * |
69 | ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) | 69 | ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) |
diff --git a/src/lib/libcrypto/ecdsa/ecs_vrf.c b/src/lib/libcrypto/ecdsa/ecs_vrf.c index 7db5a937f2..4be4c89d80 100644 --- a/src/lib/libcrypto/ecdsa/ecs_vrf.c +++ b/src/lib/libcrypto/ecdsa/ecs_vrf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecs_vrf.c,v 1.9 2022/01/27 20:30:29 tb Exp $ */ | 1 | /* $OpenBSD: ecs_vrf.c,v 1.10 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,9 +64,9 @@ | |||
64 | #include <openssl/err.h> | 64 | #include <openssl/err.h> |
65 | #include <openssl/evp.h> | 65 | #include <openssl/evp.h> |
66 | 66 | ||
67 | #include "bn_lcl.h" | 67 | #include "bn_local.h" |
68 | #include "ecs_locl.h" | 68 | #include "ecs_local.h" |
69 | #include "ec_lcl.h" | 69 | #include "ec_local.h" |
70 | 70 | ||
71 | /* returns | 71 | /* returns |
72 | * 1: correct signature | 72 | * 1: correct signature |