diff options
| author | tb <> | 2022-11-26 16:08:57 +0000 |
|---|---|---|
| committer | tb <> | 2022-11-26 16:08:57 +0000 |
| commit | 81d98bf600a381a625eb11b39a725b08c0ba547f (patch) | |
| tree | 556ebf909e81599dc3d8da585217d1576eabe0e4 /src/lib/libcrypto/ecdh | |
| parent | 9171ca1447e11e58ff2d00ba6d28293a138ae41a (diff) | |
| download | openbsd-81d98bf600a381a625eb11b39a725b08c0ba547f.tar.gz openbsd-81d98bf600a381a625eb11b39a725b08c0ba547f.tar.bz2 openbsd-81d98bf600a381a625eb11b39a725b08c0ba547f.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/ecdh')
| -rw-r--r-- | src/lib/libcrypto/ecdh/ecdh_kdf.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_key.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_lib.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_local.h (renamed from src/lib/libcrypto/ecdh/ech_locl.h) | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/ecdh/ecdh_kdf.c b/src/lib/libcrypto/ecdh/ecdh_kdf.c index 25398626e2..5c22e9c8ea 100644 --- a/src/lib/libcrypto/ecdh/ecdh_kdf.c +++ b/src/lib/libcrypto/ecdh/ecdh_kdf.c | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | #include <openssl/ec.h> | 55 | #include <openssl/ec.h> |
| 56 | #include <openssl/evp.h> | 56 | #include <openssl/evp.h> |
| 57 | 57 | ||
| 58 | #include "ech_locl.h" | 58 | #include "ech_local.h" |
| 59 | 59 | ||
| 60 | /* | 60 | /* |
| 61 | * Key derivation function from X9.63/SECG. | 61 | * Key derivation function from X9.63/SECG. |
diff --git a/src/lib/libcrypto/ecdh/ech_key.c b/src/lib/libcrypto/ecdh/ech_key.c index ee78905848..a5c6371f91 100644 --- a/src/lib/libcrypto/ecdh/ech_key.c +++ b/src/lib/libcrypto/ecdh/ech_key.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ech_key.c,v 1.13 2022/06/30 11:14:47 tb Exp $ */ | 1 | /* $OpenBSD: ech_key.c,v 1.14 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 | * |
| @@ -77,9 +77,9 @@ | |||
| 77 | #include <openssl/objects.h> | 77 | #include <openssl/objects.h> |
| 78 | #include <openssl/sha.h> | 78 | #include <openssl/sha.h> |
| 79 | 79 | ||
| 80 | #include "bn_lcl.h" | 80 | #include "bn_local.h" |
| 81 | #include "ech_locl.h" | 81 | #include "ech_local.h" |
| 82 | #include "ec_lcl.h" | 82 | #include "ec_local.h" |
| 83 | 83 | ||
| 84 | static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key, | 84 | static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key, |
| 85 | EC_KEY *ecdh, | 85 | EC_KEY *ecdh, |
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c index cc8edafa07..6caef5988f 100644 --- a/src/lib/libcrypto/ecdh/ech_lib.c +++ b/src/lib/libcrypto/ecdh/ech_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ech_lib.c,v 1.14 2018/04/14 07:09:21 tb Exp $ */ | 1 | /* $OpenBSD: ech_lib.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,7 +71,7 @@ | |||
| 71 | 71 | ||
| 72 | #include <openssl/opensslconf.h> | 72 | #include <openssl/opensslconf.h> |
| 73 | 73 | ||
| 74 | #include "ech_locl.h" | 74 | #include "ech_local.h" |
| 75 | #ifndef OPENSSL_NO_ENGINE | 75 | #ifndef OPENSSL_NO_ENGINE |
| 76 | #include <openssl/engine.h> | 76 | #include <openssl/engine.h> |
| 77 | #endif | 77 | #endif |
diff --git a/src/lib/libcrypto/ecdh/ech_locl.h b/src/lib/libcrypto/ecdh/ech_local.h index b04d325ed1..33dd943c5a 100644 --- a/src/lib/libcrypto/ecdh/ech_locl.h +++ b/src/lib/libcrypto/ecdh/ech_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ech_locl.h,v 1.6 2019/09/05 16:12:36 jsing Exp $ */ | 1 | /* $OpenBSD: ech_local.h,v 1.1 2022/11/26 16:08:52 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
