diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-11-26 16:08:58 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-11-26 16:08:58 +0000 |
| commit | 38941b484a57ccbcadf2866de19613d214fae55b (patch) | |
| tree | 149d0ae2c5ca3b764e168aa74c30999d39283299 /lib/libcrypto/cmac | |
| parent | 8eacf7b1c332fcaa29bef8b33df255735ca4614f (diff) | |
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 'lib/libcrypto/cmac')
| -rw-r--r-- | lib/libcrypto/cmac/cm_ameth.c | 6 | ||||
| -rw-r--r-- | lib/libcrypto/cmac/cm_pmeth.c | 4 | ||||
| -rw-r--r-- | lib/libcrypto/cmac/cmac.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/libcrypto/cmac/cm_ameth.c b/lib/libcrypto/cmac/cm_ameth.c index 1bc20082c15..04e0eb836f8 100644 --- a/lib/libcrypto/cmac/cm_ameth.c +++ b/lib/libcrypto/cmac/cm_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cm_ameth.c,v 1.9 2022/11/18 14:45:10 tb Exp $ */ +/* $OpenBSD: cm_ameth.c,v 1.10 2022/11/26 16:08:51 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2010. */ @@ -56,8 +56,8 @@ #include <openssl/cmac.h> #include <openssl/evp.h> -#include "asn1_locl.h" -#include "evp_locl.h" +#include "asn1_local.h" +#include "evp_local.h" /* CMAC "ASN1" method. This is just here to indicate the * maximum CMAC output length and to free up a CMAC diff --git a/lib/libcrypto/cmac/cm_pmeth.c b/lib/libcrypto/cmac/cm_pmeth.c index 91f7e34c29d..d47cfb7b73f 100644 --- a/lib/libcrypto/cmac/cm_pmeth.c +++ b/lib/libcrypto/cmac/cm_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cm_pmeth.c,v 1.9 2022/11/18 14:45:10 tb Exp $ */ +/* $OpenBSD: cm_pmeth.c,v 1.10 2022/11/26 16:08:51 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2010. */ @@ -59,7 +59,7 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> -#include "evp_locl.h" +#include "evp_local.h" /* The context structure and "key" is simply a CMAC_CTX */ diff --git a/lib/libcrypto/cmac/cmac.c b/lib/libcrypto/cmac/cmac.c index cd286f88e32..e7b343e2160 100644 --- a/lib/libcrypto/cmac/cmac.c +++ b/lib/libcrypto/cmac/cmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmac.c,v 1.11 2021/12/12 21:30:13 tb Exp $ */ +/* $OpenBSD: cmac.c,v 1.12 2022/11/26 16:08:51 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -57,7 +57,7 @@ #include <openssl/cmac.h> -#include "evp_locl.h" +#include "evp_local.h" struct CMAC_CTX_st { /* Cipher context to use */ |