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/regress/lib/libssl | |
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/regress/lib/libssl')
-rw-r--r-- | src/regress/lib/libssl/asn1/asn1test.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/dtls/dtlstest.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/exporter/exportertest.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/key_schedule/key_schedule.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/record_layer/record_layer_test.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/ssl/ssltest.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/tlsext/tlsexttest.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/unit/cipher_list.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/unit/ssl_versions.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/unit/tls_ext_alpn.c | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/unit/tls_prf.c | 4 |
11 files changed, 22 insertions, 22 deletions
diff --git a/src/regress/lib/libssl/asn1/asn1test.c b/src/regress/lib/libssl/asn1/asn1test.c index 4cb905a86e..6e9362b3e5 100644 --- a/src/regress/lib/libssl/asn1/asn1test.c +++ b/src/regress/lib/libssl/asn1/asn1test.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1test.c,v 1.11 2022/06/07 18:00:51 tb Exp $ */ | 1 | /* $OpenBSD: asn1test.c,v 1.12 2022/11/26 16:08:56 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014, 2016 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014, 2016 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -23,7 +23,7 @@ | |||
23 | #include <openssl/ssl.h> | 23 | #include <openssl/ssl.h> |
24 | #include <openssl/tls1.h> | 24 | #include <openssl/tls1.h> |
25 | 25 | ||
26 | #include "ssl_locl.h" | 26 | #include "ssl_local.h" |
27 | 27 | ||
28 | int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); | 28 | int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); |
29 | SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, | 29 | SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, |
diff --git a/src/regress/lib/libssl/dtls/dtlstest.c b/src/regress/lib/libssl/dtls/dtlstest.c index 2d0d6cf5e8..a749bcf0ed 100644 --- a/src/regress/lib/libssl/dtls/dtlstest.c +++ b/src/regress/lib/libssl/dtls/dtlstest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dtlstest.c,v 1.17 2022/10/26 20:31:38 tb Exp $ */ | 1 | /* $OpenBSD: dtlstest.c,v 1.18 2022/11/26 16:08:56 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2020, 2021 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2020, 2021 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -28,7 +28,7 @@ | |||
28 | #include <openssl/ssl.h> | 28 | #include <openssl/ssl.h> |
29 | 29 | ||
30 | #include "bio_local.h" | 30 | #include "bio_local.h" |
31 | #include "ssl_locl.h" | 31 | #include "ssl_local.h" |
32 | 32 | ||
33 | const char *server_ca_file; | 33 | const char *server_ca_file; |
34 | const char *server_cert_file; | 34 | const char *server_cert_file; |
diff --git a/src/regress/lib/libssl/exporter/exportertest.c b/src/regress/lib/libssl/exporter/exportertest.c index d8606fc027..66155bde57 100644 --- a/src/regress/lib/libssl/exporter/exportertest.c +++ b/src/regress/lib/libssl/exporter/exportertest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: exportertest.c,v 1.1 2022/11/05 21:58:24 jsing Exp $ */ | 1 | /* $OpenBSD: exportertest.c,v 1.2 2022/11/26 16:08:56 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -22,7 +22,7 @@ | |||
22 | #include <stdio.h> | 22 | #include <stdio.h> |
23 | #include <string.h> | 23 | #include <string.h> |
24 | 24 | ||
25 | #include "ssl_locl.h" | 25 | #include "ssl_local.h" |
26 | 26 | ||
27 | static void | 27 | static void |
28 | hexdump(const unsigned char *buf, size_t len) | 28 | hexdump(const unsigned char *buf, size_t len) |
diff --git a/src/regress/lib/libssl/key_schedule/key_schedule.c b/src/regress/lib/libssl/key_schedule/key_schedule.c index 2746bb593d..f937d042c4 100644 --- a/src/regress/lib/libssl/key_schedule/key_schedule.c +++ b/src/regress/lib/libssl/key_schedule/key_schedule.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key_schedule.c,v 1.9 2019/11/18 02:09:58 beck Exp $ */ | 1 | /* $OpenBSD: key_schedule.c,v 1.10 2022/11/26 16:08:56 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include <err.h> | 18 | #include <err.h> |
19 | 19 | ||
20 | #include "ssl_locl.h" | 20 | #include "ssl_local.h" |
21 | 21 | ||
22 | #include "bytestring.h" | 22 | #include "bytestring.h" |
23 | #include "ssl_tlsext.h" | 23 | #include "ssl_tlsext.h" |
diff --git a/src/regress/lib/libssl/record_layer/record_layer_test.c b/src/regress/lib/libssl/record_layer/record_layer_test.c index 95f13b8cc7..2db0c10f83 100644 --- a/src/regress/lib/libssl/record_layer/record_layer_test.c +++ b/src/regress/lib/libssl/record_layer/record_layer_test.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: record_layer_test.c,v 1.5 2022/06/10 22:00:15 tb Exp $ */ | 1 | /* $OpenBSD: record_layer_test.c,v 1.6 2022/11/26 16:08:56 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -18,7 +18,7 @@ | |||
18 | #include <err.h> | 18 | #include <err.h> |
19 | #include <string.h> | 19 | #include <string.h> |
20 | 20 | ||
21 | #include "ssl_locl.h" | 21 | #include "ssl_local.h" |
22 | #include "tls13_internal.h" | 22 | #include "tls13_internal.h" |
23 | #include "tls13_record.h" | 23 | #include "tls13_record.h" |
24 | 24 | ||
diff --git a/src/regress/lib/libssl/ssl/ssltest.c b/src/regress/lib/libssl/ssl/ssltest.c index ff5a584d6c..c72551cf52 100644 --- a/src/regress/lib/libssl/ssl/ssltest.c +++ b/src/regress/lib/libssl/ssl/ssltest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssltest.c,v 1.35 2022/07/07 13:10:22 tb Exp $ */ | 1 | /* $OpenBSD: ssltest.c,v 1.36 2022/11/26 16:08:57 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 | * |
@@ -176,7 +176,7 @@ | |||
176 | #include <openssl/dh.h> | 176 | #include <openssl/dh.h> |
177 | #include <openssl/bn.h> | 177 | #include <openssl/bn.h> |
178 | 178 | ||
179 | #include "ssl_locl.h" | 179 | #include "ssl_local.h" |
180 | 180 | ||
181 | #define TEST_SERVER_CERT "../apps/server.pem" | 181 | #define TEST_SERVER_CERT "../apps/server.pem" |
182 | #define TEST_CLIENT_CERT "../apps/client.pem" | 182 | #define TEST_CLIENT_CERT "../apps/client.pem" |
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c index dd5eeec1f5..923c50d5aa 100644 --- a/src/regress/lib/libssl/tlsext/tlsexttest.c +++ b/src/regress/lib/libssl/tlsext/tlsexttest.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tlsexttest.c,v 1.78 2022/10/21 14:58:53 tb Exp $ */ | 1 | /* $OpenBSD: tlsexttest.c,v 1.79 2022/11/26 16:08:57 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include <openssl/tls1.h> | 23 | #include <openssl/tls1.h> |
24 | 24 | ||
25 | #include "ssl_locl.h" | 25 | #include "ssl_local.h" |
26 | 26 | ||
27 | #include "bytestring.h" | 27 | #include "bytestring.h" |
28 | #include "ssl_tlsext.h" | 28 | #include "ssl_tlsext.h" |
diff --git a/src/regress/lib/libssl/unit/cipher_list.c b/src/regress/lib/libssl/unit/cipher_list.c index 543db41c24..a63c5ae69f 100644 --- a/src/regress/lib/libssl/unit/cipher_list.c +++ b/src/regress/lib/libssl/unit/cipher_list.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher_list.c,v 1.12 2022/10/02 16:38:23 jsing Exp $ */ | 1 | /* $OpenBSD: cipher_list.c,v 1.13 2022/11/26 16:08:57 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> | 3 | * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> |
4 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> | 4 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> |
@@ -39,7 +39,7 @@ | |||
39 | #include <stdio.h> | 39 | #include <stdio.h> |
40 | #include <string.h> | 40 | #include <string.h> |
41 | 41 | ||
42 | #include "ssl_locl.h" | 42 | #include "ssl_local.h" |
43 | 43 | ||
44 | #include "tests.h" | 44 | #include "tests.h" |
45 | 45 | ||
diff --git a/src/regress/lib/libssl/unit/ssl_versions.c b/src/regress/lib/libssl/unit/ssl_versions.c index e9bcecafe5..261bed3a7a 100644 --- a/src/regress/lib/libssl/unit/ssl_versions.c +++ b/src/regress/lib/libssl/unit/ssl_versions.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_versions.c,v 1.18 2022/10/02 16:38:23 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_versions.c,v 1.19 2022/11/26 16:08:57 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include <openssl/ssl.h> | 18 | #include <openssl/ssl.h> |
19 | 19 | ||
20 | #include "ssl_locl.h" | 20 | #include "ssl_local.h" |
21 | 21 | ||
22 | struct version_range_test { | 22 | struct version_range_test { |
23 | const long options; | 23 | const long options; |
diff --git a/src/regress/lib/libssl/unit/tls_ext_alpn.c b/src/regress/lib/libssl/unit/tls_ext_alpn.c index f0e4894557..d00f3efb5f 100644 --- a/src/regress/lib/libssl/unit/tls_ext_alpn.c +++ b/src/regress/lib/libssl/unit/tls_ext_alpn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_ext_alpn.c,v 1.8 2022/10/02 16:38:23 jsing Exp $ */ | 1 | /* $OpenBSD: tls_ext_alpn.c,v 1.9 2022/11/26 16:08:57 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> | 3 | * Copyright (c) 2015 Doug Hogan <doug@openbsd.org> |
4 | * | 4 | * |
@@ -21,7 +21,7 @@ | |||
21 | #include <stdio.h> | 21 | #include <stdio.h> |
22 | #include <openssl/ssl.h> | 22 | #include <openssl/ssl.h> |
23 | 23 | ||
24 | #include "ssl_locl.h" | 24 | #include "ssl_local.h" |
25 | #include "ssl_tlsext.h" | 25 | #include "ssl_tlsext.h" |
26 | 26 | ||
27 | #include "tests.h" | 27 | #include "tests.h" |
diff --git a/src/regress/lib/libssl/unit/tls_prf.c b/src/regress/lib/libssl/unit/tls_prf.c index bf0de1f044..a22d0e70d0 100644 --- a/src/regress/lib/libssl/unit/tls_prf.c +++ b/src/regress/lib/libssl/unit/tls_prf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_prf.c,v 1.7 2022/06/10 22:00:15 tb Exp $ */ | 1 | /* $OpenBSD: tls_prf.c,v 1.8 2022/11/26 16:08:57 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include <err.h> | 18 | #include <err.h> |
19 | 19 | ||
20 | #include "ssl_locl.h" | 20 | #include "ssl_local.h" |
21 | 21 | ||
22 | int tls1_PRF(SSL *s, const unsigned char *secret, size_t secret_len, | 22 | int tls1_PRF(SSL *s, const unsigned char *secret, size_t secret_len, |
23 | const void *seed1, size_t seed1_len, const void *seed2, size_t seed2_len, | 23 | const void *seed1, size_t seed1_len, const void *seed2, size_t seed2_len, |