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/pkcs12/p12_mutl.c | |
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/pkcs12/p12_mutl.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_mutl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c index 68fb1b9e5d..abfd9dd4b7 100644 --- a/src/lib/libcrypto/pkcs12/p12_mutl.c +++ b/src/lib/libcrypto/pkcs12/p12_mutl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_mutl.c,v 1.33 2022/11/12 13:03:28 beck Exp $ */ | 1 | /* $OpenBSD: p12_mutl.c,v 1.34 2022/11/26 16:08:53 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 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -68,10 +68,10 @@ | |||
68 | #include <openssl/hmac.h> | 68 | #include <openssl/hmac.h> |
69 | #include <openssl/pkcs12.h> | 69 | #include <openssl/pkcs12.h> |
70 | 70 | ||
71 | #include "evp_locl.h" | 71 | #include "evp_local.h" |
72 | #include "hmac_local.h" | 72 | #include "hmac_local.h" |
73 | #include "pkcs12_local.h" | 73 | #include "pkcs12_local.h" |
74 | #include "x509_lcl.h" | 74 | #include "x509_local.h" |
75 | 75 | ||
76 | int | 76 | int |
77 | PKCS12_mac_present(const PKCS12 *p12) | 77 | PKCS12_mac_present(const PKCS12 *p12) |