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/camellia | |
| 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/camellia')
| -rw-r--r-- | src/lib/libcrypto/camellia/camellia.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/camellia/cmll_ecb.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/camellia/cmll_local.h (renamed from src/lib/libcrypto/camellia/cmll_locl.h) | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/camellia/cmll_misc.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/camellia/camellia.c b/src/lib/libcrypto/camellia/camellia.c index 5f754ff78b..336074ad7c 100644 --- a/src/lib/libcrypto/camellia/camellia.c +++ b/src/lib/libcrypto/camellia/camellia.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: camellia.c,v 1.11 2016/09/04 14:31:29 jsing Exp $ */ | 1 | /* $OpenBSD: camellia.c,v 1.12 2022/11/26 16:08:51 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . | 3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . |
| 4 | * ALL RIGHTS RESERVED. | 4 | * ALL RIGHTS RESERVED. |
| @@ -87,7 +87,7 @@ | |||
| 87 | #include <openssl/camellia.h> | 87 | #include <openssl/camellia.h> |
| 88 | #include <openssl/opensslconf.h> | 88 | #include <openssl/opensslconf.h> |
| 89 | 89 | ||
| 90 | #include "cmll_locl.h" | 90 | #include "cmll_local.h" |
| 91 | 91 | ||
| 92 | /* 32-bit rotations */ | 92 | /* 32-bit rotations */ |
| 93 | #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) | 93 | #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) |
diff --git a/src/lib/libcrypto/camellia/cmll_ecb.c b/src/lib/libcrypto/camellia/cmll_ecb.c index 1a65445202..b47ece7379 100644 --- a/src/lib/libcrypto/camellia/cmll_ecb.c +++ b/src/lib/libcrypto/camellia/cmll_ecb.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cmll_ecb.c,v 1.4 2014/11/13 20:01:58 miod Exp $ */ | 1 | /* $OpenBSD: cmll_ecb.c,v 1.5 2022/11/26 16:08:51 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 | * |
| @@ -50,7 +50,7 @@ | |||
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <openssl/camellia.h> | 52 | #include <openssl/camellia.h> |
| 53 | #include "cmll_locl.h" | 53 | #include "cmll_local.h" |
| 54 | 54 | ||
| 55 | void | 55 | void |
| 56 | Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, | 56 | Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, |
diff --git a/src/lib/libcrypto/camellia/cmll_locl.h b/src/lib/libcrypto/camellia/cmll_local.h index 325b6e2d6f..b8bef6fb75 100644 --- a/src/lib/libcrypto/camellia/cmll_locl.h +++ b/src/lib/libcrypto/camellia/cmll_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cmll_locl.h,v 1.6 2016/12/21 15:49:29 jsing Exp $ */ | 1 | /* $OpenBSD: cmll_local.h,v 1.1 2022/11/26 16:08:51 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . | 3 | * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . |
| 4 | * ALL RIGHTS RESERVED. | 4 | * ALL RIGHTS RESERVED. |
diff --git a/src/lib/libcrypto/camellia/cmll_misc.c b/src/lib/libcrypto/camellia/cmll_misc.c index 2fa61dc637..9fce92df20 100644 --- a/src/lib/libcrypto/camellia/cmll_misc.c +++ b/src/lib/libcrypto/camellia/cmll_misc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cmll_misc.c,v 1.6 2014/11/13 20:01:58 miod Exp $ */ | 1 | /* $OpenBSD: cmll_misc.c,v 1.7 2022/11/26 16:08:51 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/opensslv.h> | 52 | #include <openssl/opensslv.h> |
| 53 | #include <openssl/crypto.h> | 53 | #include <openssl/crypto.h> |
| 54 | #include <openssl/camellia.h> | 54 | #include <openssl/camellia.h> |
| 55 | #include "cmll_locl.h" | 55 | #include "cmll_local.h" |
| 56 | 56 | ||
| 57 | int | 57 | int |
| 58 | Camellia_set_key(const unsigned char *userKey, const int bits, | 58 | Camellia_set_key(const unsigned char *userKey, const int bits, |
