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/bf | |
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/bf')
-rw-r--r-- | src/lib/libcrypto/bf/bf_cbc.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/bf_cfb64.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/bf_ecb.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/bf_enc.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/bf_local.h (renamed from src/lib/libcrypto/bf/bf_locl.h) | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/bf_ofb64.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bf/bf_skey.c | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/bf/bf_cbc.c b/src/lib/libcrypto/bf/bf_cbc.c index b13ea12961..044bd19ed7 100644 --- a/src/lib/libcrypto/bf/bf_cbc.c +++ b/src/lib/libcrypto/bf/bf_cbc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_cbc.c,v 1.7 2022/11/11 12:18:25 jsing Exp $ */ | 1 | /* $OpenBSD: bf_cbc.c,v 1.8 2022/11/26 16:08:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | #include <openssl/blowfish.h> | 59 | #include <openssl/blowfish.h> |
60 | 60 | ||
61 | #include "bf_locl.h" | 61 | #include "bf_local.h" |
62 | 62 | ||
63 | void | 63 | void |
64 | BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | 64 | BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, |
diff --git a/src/lib/libcrypto/bf/bf_cfb64.c b/src/lib/libcrypto/bf/bf_cfb64.c index 7db0aed1ea..87dccae263 100644 --- a/src/lib/libcrypto/bf/bf_cfb64.c +++ b/src/lib/libcrypto/bf/bf_cfb64.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_cfb64.c,v 1.7 2022/11/11 12:18:25 jsing Exp $ */ | 1 | /* $OpenBSD: bf_cfb64.c,v 1.8 2022/11/26 16:08:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | #include <openssl/blowfish.h> | 59 | #include <openssl/blowfish.h> |
60 | 60 | ||
61 | #include "bf_locl.h" | 61 | #include "bf_local.h" |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * The input and output encrypted as though 64bit cfb mode is being | 64 | * The input and output encrypted as though 64bit cfb mode is being |
diff --git a/src/lib/libcrypto/bf/bf_ecb.c b/src/lib/libcrypto/bf/bf_ecb.c index 2430455c39..99e50b0ffe 100644 --- a/src/lib/libcrypto/bf/bf_ecb.c +++ b/src/lib/libcrypto/bf/bf_ecb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_ecb.c,v 1.8 2022/11/11 12:18:25 jsing Exp $ */ | 1 | /* $OpenBSD: bf_ecb.c,v 1.9 2022/11/26 16:08:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -59,7 +59,7 @@ | |||
59 | #include <openssl/blowfish.h> | 59 | #include <openssl/blowfish.h> |
60 | #include <openssl/opensslv.h> | 60 | #include <openssl/opensslv.h> |
61 | 61 | ||
62 | #include "bf_locl.h" | 62 | #include "bf_local.h" |
63 | 63 | ||
64 | /* | 64 | /* |
65 | * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' | 65 | * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' |
diff --git a/src/lib/libcrypto/bf/bf_enc.c b/src/lib/libcrypto/bf/bf_enc.c index 780e703805..bbefe7d526 100644 --- a/src/lib/libcrypto/bf/bf_enc.c +++ b/src/lib/libcrypto/bf/bf_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_enc.c,v 1.8 2022/11/11 12:18:25 jsing Exp $ */ | 1 | /* $OpenBSD: bf_enc.c,v 1.9 2022/11/26 16:08:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | #include <openssl/blowfish.h> | 59 | #include <openssl/blowfish.h> |
60 | 60 | ||
61 | #include "bf_locl.h" | 61 | #include "bf_local.h" |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' | 64 | * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' |
diff --git a/src/lib/libcrypto/bf/bf_locl.h b/src/lib/libcrypto/bf/bf_local.h index f46ff499fb..1cc29525dd 100644 --- a/src/lib/libcrypto/bf/bf_locl.h +++ b/src/lib/libcrypto/bf/bf_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_locl.h,v 1.4 2022/11/11 12:08:29 jsing Exp $ */ | 1 | /* $OpenBSD: bf_local.h,v 1.1 2022/11/26 16:08:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
diff --git a/src/lib/libcrypto/bf/bf_ofb64.c b/src/lib/libcrypto/bf/bf_ofb64.c index e7aefef09d..8fe2478263 100644 --- a/src/lib/libcrypto/bf/bf_ofb64.c +++ b/src/lib/libcrypto/bf/bf_ofb64.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_ofb64.c,v 1.7 2022/11/11 12:18:25 jsing Exp $ */ | 1 | /* $OpenBSD: bf_ofb64.c,v 1.8 2022/11/26 16:08:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | #include <openssl/blowfish.h> | 59 | #include <openssl/blowfish.h> |
60 | 60 | ||
61 | #include "bf_locl.h" | 61 | #include "bf_local.h" |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * The input and output encrypted as though 64bit ofb mode is being | 64 | * The input and output encrypted as though 64bit ofb mode is being |
diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c index 4a5c1be140..cc31034f18 100644 --- a/src/lib/libcrypto/bf/bf_skey.c +++ b/src/lib/libcrypto/bf/bf_skey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_skey.c,v 1.16 2022/11/11 12:23:49 jsing Exp $ */ | 1 | /* $OpenBSD: bf_skey.c,v 1.17 2022/11/26 16:08:51 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -62,7 +62,7 @@ | |||
62 | #include <openssl/crypto.h> | 62 | #include <openssl/crypto.h> |
63 | #include <openssl/blowfish.h> | 63 | #include <openssl/blowfish.h> |
64 | 64 | ||
65 | #include "bf_locl.h" | 65 | #include "bf_local.h" |
66 | 66 | ||
67 | static const BF_KEY bf_init = { | 67 | static const BF_KEY bf_init = { |
68 | .P = { | 68 | .P = { |