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/aes | |
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/aes')
-rw-r--r-- | src/lib/libcrypto/aes/aes_core.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/aes/aes_ecb.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/aes/aes_ige.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/aes/aes_local.h (renamed from src/lib/libcrypto/aes/aes_locl.h) | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/aes/aes_misc.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/aes/aes_x86core.c | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/libcrypto/aes/aes_core.c b/src/lib/libcrypto/aes/aes_core.c index 1b8a24c714..e3fdb4fd5e 100644 --- a/src/lib/libcrypto/aes/aes_core.c +++ b/src/lib/libcrypto/aes/aes_core.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_core.c,v 1.13 2015/11/05 21:59:13 miod Exp $ */ | 1 | /* $OpenBSD: aes_core.c,v 1.14 2022/11/26 16:08:50 tb Exp $ */ |
2 | /** | 2 | /** |
3 | * rijndael-alg-fst.c | 3 | * rijndael-alg-fst.c |
4 | * | 4 | * |
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #include <stdlib.h> | 37 | #include <stdlib.h> |
38 | #include <openssl/aes.h> | 38 | #include <openssl/aes.h> |
39 | #include "aes_locl.h" | 39 | #include "aes_local.h" |
40 | 40 | ||
41 | #ifndef AES_ASM | 41 | #ifndef AES_ASM |
42 | /* | 42 | /* |
diff --git a/src/lib/libcrypto/aes/aes_ecb.c b/src/lib/libcrypto/aes/aes_ecb.c index b05e53994b..e3bb40b5aa 100644 --- a/src/lib/libcrypto/aes/aes_ecb.c +++ b/src/lib/libcrypto/aes/aes_ecb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_ecb.c,v 1.6 2015/02/10 09:46:30 miod Exp $ */ | 1 | /* $OpenBSD: aes_ecb.c,v 1.7 2022/11/26 16:08:50 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 | * |
@@ -56,7 +56,7 @@ | |||
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | #include <openssl/aes.h> | 58 | #include <openssl/aes.h> |
59 | #include "aes_locl.h" | 59 | #include "aes_local.h" |
60 | 60 | ||
61 | void | 61 | void |
62 | AES_ecb_encrypt(const unsigned char *in, unsigned char *out, | 62 | AES_ecb_encrypt(const unsigned char *in, unsigned char *out, |
diff --git a/src/lib/libcrypto/aes/aes_ige.c b/src/lib/libcrypto/aes/aes_ige.c index 244a5a36bd..ef7d7662fd 100644 --- a/src/lib/libcrypto/aes/aes_ige.c +++ b/src/lib/libcrypto/aes/aes_ige.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_ige.c,v 1.8 2022/01/22 00:43:41 inoguchi Exp $ */ | 1 | /* $OpenBSD: aes_ige.c,v 1.9 2022/11/26 16:08:50 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 | * |
@@ -52,7 +52,7 @@ | |||
52 | #include <openssl/aes.h> | 52 | #include <openssl/aes.h> |
53 | #include <openssl/crypto.h> | 53 | #include <openssl/crypto.h> |
54 | 54 | ||
55 | #include "aes_locl.h" | 55 | #include "aes_local.h" |
56 | 56 | ||
57 | #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long)) | 57 | #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long)) |
58 | typedef struct { | 58 | typedef struct { |
diff --git a/src/lib/libcrypto/aes/aes_locl.h b/src/lib/libcrypto/aes/aes_local.h index c47f65da62..4c984e0de6 100644 --- a/src/lib/libcrypto/aes/aes_locl.h +++ b/src/lib/libcrypto/aes/aes_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_locl.h,v 1.11 2016/12/21 15:49:29 jsing Exp $ */ | 1 | /* $OpenBSD: aes_local.h,v 1.1 2022/11/26 16:08:50 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 | * |
diff --git a/src/lib/libcrypto/aes/aes_misc.c b/src/lib/libcrypto/aes/aes_misc.c index 6c1506dd79..4ed55b1e50 100644 --- a/src/lib/libcrypto/aes/aes_misc.c +++ b/src/lib/libcrypto/aes/aes_misc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_misc.c,v 1.10 2014/07/09 11:10:50 bcook Exp $ */ | 1 | /* $OpenBSD: aes_misc.c,v 1.11 2022/11/26 16:08:50 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 | * |
@@ -52,7 +52,7 @@ | |||
52 | #include <openssl/opensslv.h> | 52 | #include <openssl/opensslv.h> |
53 | #include <openssl/crypto.h> | 53 | #include <openssl/crypto.h> |
54 | #include <openssl/aes.h> | 54 | #include <openssl/aes.h> |
55 | #include "aes_locl.h" | 55 | #include "aes_local.h" |
56 | 56 | ||
57 | const char * | 57 | const char * |
58 | AES_options(void) | 58 | AES_options(void) |
diff --git a/src/lib/libcrypto/aes/aes_x86core.c b/src/lib/libcrypto/aes/aes_x86core.c index d0d12dc3ae..f76004e126 100644 --- a/src/lib/libcrypto/aes/aes_x86core.c +++ b/src/lib/libcrypto/aes/aes_x86core.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: aes_x86core.c,v 1.9 2018/04/03 21:59:37 tb Exp $ */ | 1 | /* $OpenBSD: aes_x86core.c,v 1.10 2022/11/26 16:08:50 tb Exp $ */ |
2 | /** | 2 | /** |
3 | * rijndael-alg-fst.c | 3 | * rijndael-alg-fst.c |
4 | * | 4 | * |
@@ -43,7 +43,7 @@ | |||
43 | 43 | ||
44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
45 | #include <openssl/aes.h> | 45 | #include <openssl/aes.h> |
46 | #include "aes_locl.h" | 46 | #include "aes_local.h" |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * These two parameters control which table, 256-byte or 2KB, is | 49 | * These two parameters control which table, 256-byte or 2KB, is |