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/ui | |
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/ui')
-rw-r--r-- | src/lib/libcrypto/ui/ui_lib.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ui/ui_local.h (renamed from src/lib/libcrypto/ui/ui_locl.h) | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/ui/ui_openssl.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/ui/ui_util.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c index 0a0e11784d..f7398330e3 100644 --- a/src/lib/libcrypto/ui/ui_lib.c +++ b/src/lib/libcrypto/ui/ui_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_lib.c,v 1.45 2022/11/12 13:16:10 beck Exp $ */ | 1 | /* $OpenBSD: ui_lib.c,v 1.46 2022/11/26 16:08:54 tb Exp $ */ |
2 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL | 2 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -64,7 +64,7 @@ | |||
64 | #include <openssl/err.h> | 64 | #include <openssl/err.h> |
65 | #include <openssl/ui.h> | 65 | #include <openssl/ui.h> |
66 | 66 | ||
67 | #include "ui_locl.h" | 67 | #include "ui_local.h" |
68 | 68 | ||
69 | static const UI_METHOD *default_UI_meth = NULL; | 69 | static const UI_METHOD *default_UI_meth = NULL; |
70 | 70 | ||
diff --git a/src/lib/libcrypto/ui/ui_locl.h b/src/lib/libcrypto/ui/ui_local.h index c424be6546..d62c628f8c 100644 --- a/src/lib/libcrypto/ui/ui_locl.h +++ b/src/lib/libcrypto/ui/ui_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_locl.h,v 1.7 2016/12/21 15:49:29 jsing Exp $ */ | 1 | /* $OpenBSD: ui_local.h,v 1.1 2022/11/26 16:08:54 tb Exp $ */ |
2 | 2 | ||
3 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL | 3 | /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL |
4 | * project 2001. | 4 | * project 2001. |
diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c index 81d7b8de1c..0d2e6f1ac8 100644 --- a/src/lib/libcrypto/ui/ui_openssl.c +++ b/src/lib/libcrypto/ui/ui_openssl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_openssl.c,v 1.26 2022/11/12 13:16:10 beck Exp $ */ | 1 | /* $OpenBSD: ui_openssl.c,v 1.27 2022/11/26 16:08:54 tb Exp $ */ |
2 | /* Written by Richard Levitte (richard@levitte.org) and others | 2 | /* Written by Richard Levitte (richard@levitte.org) and others |
3 | * for the OpenSSL project 2001. | 3 | * for the OpenSSL project 2001. |
4 | */ | 4 | */ |
@@ -125,7 +125,7 @@ | |||
125 | #include <termios.h> | 125 | #include <termios.h> |
126 | #include <unistd.h> | 126 | #include <unistd.h> |
127 | 127 | ||
128 | #include "ui_locl.h" | 128 | #include "ui_local.h" |
129 | 129 | ||
130 | #ifndef NX509_SIG | 130 | #ifndef NX509_SIG |
131 | #define NX509_SIG 32 | 131 | #define NX509_SIG 32 |
diff --git a/src/lib/libcrypto/ui/ui_util.c b/src/lib/libcrypto/ui/ui_util.c index 808b294d76..347e4118bc 100644 --- a/src/lib/libcrypto/ui/ui_util.c +++ b/src/lib/libcrypto/ui/ui_util.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ui_util.c,v 1.11 2022/11/12 13:16:10 beck Exp $ */ | 1 | /* $OpenBSD: ui_util.c,v 1.12 2022/11/26 16:08:54 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | #include <openssl/ui_compat.h> | 58 | #include <openssl/ui_compat.h> |
59 | 59 | ||
60 | #include "ui_locl.h" | 60 | #include "ui_local.h" |
61 | 61 | ||
62 | int | 62 | int |
63 | UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify) | 63 | UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify) |