From d0a21970fdc0fbbfc7ad31bc135f5a8fde1d3d49 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 26 Nov 2022 16:08:57 +0000 Subject: 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 was fixed manually. discussed with jsing, no objection bcook --- src/regress/lib/libssl/asn1/asn1test.c | 4 ++-- src/regress/lib/libssl/dtls/dtlstest.c | 4 ++-- src/regress/lib/libssl/exporter/exportertest.c | 4 ++-- src/regress/lib/libssl/key_schedule/key_schedule.c | 4 ++-- src/regress/lib/libssl/record_layer/record_layer_test.c | 4 ++-- src/regress/lib/libssl/ssl/ssltest.c | 4 ++-- src/regress/lib/libssl/tlsext/tlsexttest.c | 4 ++-- src/regress/lib/libssl/unit/cipher_list.c | 4 ++-- src/regress/lib/libssl/unit/ssl_versions.c | 4 ++-- src/regress/lib/libssl/unit/tls_ext_alpn.c | 4 ++-- src/regress/lib/libssl/unit/tls_prf.c | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/regress/lib/libssl') 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 @@ -/* $OpenBSD: asn1test.c,v 1.11 2022/06/07 18:00:51 tb Exp $ */ +/* $OpenBSD: asn1test.c,v 1.12 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2014, 2016 Joel Sing * @@ -23,7 +23,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); 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 @@ -/* $OpenBSD: dtlstest.c,v 1.17 2022/10/26 20:31:38 tb Exp $ */ +/* $OpenBSD: dtlstest.c,v 1.18 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2020, 2021 Joel Sing * @@ -28,7 +28,7 @@ #include #include "bio_local.h" -#include "ssl_locl.h" +#include "ssl_local.h" const char *server_ca_file; 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 @@ -/* $OpenBSD: exportertest.c,v 1.1 2022/11/05 21:58:24 jsing Exp $ */ +/* $OpenBSD: exportertest.c,v 1.2 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2022 Joel Sing * @@ -22,7 +22,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" static void 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 @@ -/* $OpenBSD: key_schedule.c,v 1.9 2019/11/18 02:09:58 beck Exp $ */ +/* $OpenBSD: key_schedule.c,v 1.10 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2018-2019 Bob Beck * @@ -17,7 +17,7 @@ #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "bytestring.h" #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 @@ -/* $OpenBSD: record_layer_test.c,v 1.5 2022/06/10 22:00:15 tb Exp $ */ +/* $OpenBSD: record_layer_test.c,v 1.6 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2019, 2020 Joel Sing * @@ -18,7 +18,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "tls13_internal.h" #include "tls13_record.h" 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 @@ -/* $OpenBSD: ssltest.c,v 1.35 2022/07/07 13:10:22 tb Exp $ */ +/* $OpenBSD: ssltest.c,v 1.36 2022/11/26 16:08:57 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -176,7 +176,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #define TEST_SERVER_CERT "../apps/server.pem" #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 @@ -/* $OpenBSD: tlsexttest.c,v 1.78 2022/10/21 14:58:53 tb Exp $ */ +/* $OpenBSD: tlsexttest.c,v 1.79 2022/11/26 16:08:57 tb Exp $ */ /* * Copyright (c) 2017 Joel Sing * Copyright (c) 2017 Doug Hogan @@ -22,7 +22,7 @@ #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "bytestring.h" #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 @@ -/* $OpenBSD: cipher_list.c,v 1.12 2022/10/02 16:38:23 jsing Exp $ */ +/* $OpenBSD: cipher_list.c,v 1.13 2022/11/26 16:08:57 tb Exp $ */ /* * Copyright (c) 2015 Doug Hogan * Copyright (c) 2015 Joel Sing @@ -39,7 +39,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "tests.h" 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 @@ -/* $OpenBSD: ssl_versions.c,v 1.18 2022/10/02 16:38:23 jsing Exp $ */ +/* $OpenBSD: ssl_versions.c,v 1.19 2022/11/26 16:08:57 tb Exp $ */ /* * Copyright (c) 2016, 2017 Joel Sing * @@ -17,7 +17,7 @@ #include -#include "ssl_locl.h" +#include "ssl_local.h" struct version_range_test { 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 @@ -/* $OpenBSD: tls_ext_alpn.c,v 1.8 2022/10/02 16:38:23 jsing Exp $ */ +/* $OpenBSD: tls_ext_alpn.c,v 1.9 2022/11/26 16:08:57 tb Exp $ */ /* * Copyright (c) 2015 Doug Hogan * @@ -21,7 +21,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "ssl_tlsext.h" #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 @@ -/* $OpenBSD: tls_prf.c,v 1.7 2022/06/10 22:00:15 tb Exp $ */ +/* $OpenBSD: tls_prf.c,v 1.8 2022/11/26 16:08:57 tb Exp $ */ /* * Copyright (c) 2017 Joel Sing * @@ -17,7 +17,7 @@ #include -#include "ssl_locl.h" +#include "ssl_local.h" int tls1_PRF(SSL *s, const unsigned char *secret, size_t secret_len, const void *seed1, size_t seed1_len, const void *seed2, size_t seed2_len, -- cgit v1.2.3-55-g6feb