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/engine | |
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/engine')
-rw-r--r-- | src/lib/libcrypto/engine/eng_openssl.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/tb_asnmth.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/engine/eng_openssl.c b/src/lib/libcrypto/engine/eng_openssl.c index 1a6113ba6d..c632279faa 100644 --- a/src/lib/libcrypto/engine/eng_openssl.c +++ b/src/lib/libcrypto/engine/eng_openssl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: eng_openssl.c,v 1.15 2022/01/09 23:55:31 tb Exp $ */ | 1 | /* $OpenBSD: eng_openssl.c,v 1.16 2022/11/26 16:08:52 tb Exp $ */ |
2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -84,7 +84,7 @@ | |||
84 | #include <openssl/rsa.h> | 84 | #include <openssl/rsa.h> |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #include "evp_locl.h" | 87 | #include "evp_local.h" |
88 | 88 | ||
89 | /* This testing gunk is implemented (and explained) lower down. It also assumes | 89 | /* This testing gunk is implemented (and explained) lower down. It also assumes |
90 | * the application explicitly calls "ENGINE_load_openssl()" because this is no | 90 | * the application explicitly calls "ENGINE_load_openssl()" because this is no |
diff --git a/src/lib/libcrypto/engine/tb_asnmth.c b/src/lib/libcrypto/engine/tb_asnmth.c index 51e5198b40..913230f696 100644 --- a/src/lib/libcrypto/engine/tb_asnmth.c +++ b/src/lib/libcrypto/engine/tb_asnmth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tb_asnmth.c,v 1.6 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: tb_asnmth.c,v 1.7 2022/11/26 16:08:52 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -58,7 +58,7 @@ | |||
58 | #include <openssl/err.h> | 58 | #include <openssl/err.h> |
59 | 59 | ||
60 | #include "eng_int.h" | 60 | #include "eng_int.h" |
61 | #include "asn1_locl.h" | 61 | #include "asn1_local.h" |
62 | #include <openssl/evp.h> | 62 | #include <openssl/evp.h> |
63 | 63 | ||
64 | /* If this symbol is defined then ENGINE_get_pkey_asn1_meth_engine(), the | 64 | /* If this symbol is defined then ENGINE_get_pkey_asn1_meth_engine(), the |