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/libcrypto/asn1/asn1basic.c | 4 ++-- src/regress/lib/libcrypto/asn1/asn1object.c | 4 ++-- src/regress/lib/libcrypto/bn/general/bn_isqrt.c | 4 ++-- src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c | 4 ++-- src/regress/lib/libcrypto/evp/evp_test.c | 4 ++-- src/regress/lib/libcrypto/sm2/sm2crypttest.c | 4 ++-- src/regress/lib/libcrypto/sm2/sm2sigtest.c | 4 ++-- src/regress/lib/libcrypto/utf8/utf8test.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/regress/lib/libcrypto') diff --git a/src/regress/lib/libcrypto/asn1/asn1basic.c b/src/regress/lib/libcrypto/asn1/asn1basic.c index 45f61ed859..1703ba964b 100644 --- a/src/regress/lib/libcrypto/asn1/asn1basic.c +++ b/src/regress/lib/libcrypto/asn1/asn1basic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1basic.c,v 1.12 2022/09/05 21:06:31 tb Exp $ */ +/* $OpenBSD: asn1basic.c,v 1.13 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2017, 2021 Joel Sing * @@ -22,7 +22,7 @@ #include #include -#include "asn1_locl.h" +#include "asn1_local.h" static void hexdump(const unsigned char *buf, size_t len) diff --git a/src/regress/lib/libcrypto/asn1/asn1object.c b/src/regress/lib/libcrypto/asn1/asn1object.c index 3452a713a0..539c6aa950 100644 --- a/src/regress/lib/libcrypto/asn1/asn1object.c +++ b/src/regress/lib/libcrypto/asn1/asn1object.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1object.c,v 1.9 2022/09/05 21:06:31 tb Exp $ */ +/* $OpenBSD: asn1object.c,v 1.10 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2017, 2021, 2022 Joel Sing * @@ -22,7 +22,7 @@ #include #include -#include "asn1_locl.h" +#include "asn1_local.h" static void hexdump(const unsigned char *buf, size_t len) diff --git a/src/regress/lib/libcrypto/bn/general/bn_isqrt.c b/src/regress/lib/libcrypto/bn/general/bn_isqrt.c index b9939dc59c..8ea9cead77 100644 --- a/src/regress/lib/libcrypto/bn/general/bn_isqrt.c +++ b/src/regress/lib/libcrypto/bn/general/bn_isqrt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_isqrt.c,v 1.7 2022/10/11 13:51:41 tb Exp $ */ +/* $OpenBSD: bn_isqrt.c,v 1.8 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * @@ -21,7 +21,7 @@ #include -#include "bn_lcl.h" +#include "bn_local.h" #define N_TESTS 400 diff --git a/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c b/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c index 5f8cc20d74..20a385588e 100644 --- a/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c +++ b/src/regress/lib/libcrypto/evp/evp_pkey_cleanup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pkey_cleanup.c,v 1.1 2022/03/30 08:57:26 tb Exp $ */ +/* $OpenBSD: evp_pkey_cleanup.c,v 1.2 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler @@ -20,7 +20,7 @@ #include -#include "evp_locl.h" +#include "evp_local.h" struct pkey_cleanup_test { const char *name; diff --git a/src/regress/lib/libcrypto/evp/evp_test.c b/src/regress/lib/libcrypto/evp/evp_test.c index c4721cc365..dbfe442377 100644 --- a/src/regress/lib/libcrypto/evp/evp_test.c +++ b/src/regress/lib/libcrypto/evp/evp_test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_test.c,v 1.2 2022/11/09 17:15:59 jsing Exp $ */ +/* $OpenBSD: evp_test.c,v 1.3 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2022 Joel Sing * @@ -18,7 +18,7 @@ #include #include -#include "evp_locl.h" +#include "evp_local.h" static int evp_asn1_method_test(void) diff --git a/src/regress/lib/libcrypto/sm2/sm2crypttest.c b/src/regress/lib/libcrypto/sm2/sm2crypttest.c index 30a03b21c9..80dcb935b7 100644 --- a/src/regress/lib/libcrypto/sm2/sm2crypttest.c +++ b/src/regress/lib/libcrypto/sm2/sm2crypttest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sm2crypttest.c,v 1.1.1.1 2021/08/18 16:06:56 tb Exp $ */ +/* $OpenBSD: sm2crypttest.c,v 1.2 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2017, 2019 Ribose Inc * @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) } #else #include -#include "sm2_locl.h" +#include "sm2_local.h" static EC_GROUP * create_EC_group(const char *p_hex, const char *a_hex, const char *b_hex, diff --git a/src/regress/lib/libcrypto/sm2/sm2sigtest.c b/src/regress/lib/libcrypto/sm2/sm2sigtest.c index bd156799b8..2ded5c45ba 100644 --- a/src/regress/lib/libcrypto/sm2/sm2sigtest.c +++ b/src/regress/lib/libcrypto/sm2/sm2sigtest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sm2sigtest.c,v 1.1.1.1 2021/08/18 16:06:56 tb Exp $ */ +/* $OpenBSD: sm2sigtest.c,v 1.2 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2017, 2019 Ribose Inc * @@ -35,7 +35,7 @@ main(int argc, char *argv[]) } #else #include -#include "sm2_locl.h" +#include "sm2_local.h" static EC_GROUP * create_EC_group(const char *p_hex, const char *a_hex, const char *b_hex, diff --git a/src/regress/lib/libcrypto/utf8/utf8test.c b/src/regress/lib/libcrypto/utf8/utf8test.c index e3a47d5adf..26477e882c 100644 --- a/src/regress/lib/libcrypto/utf8/utf8test.c +++ b/src/regress/lib/libcrypto/utf8/utf8test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utf8test.c,v 1.4 2018/07/17 17:06:50 tb Exp $ */ +/* $OpenBSD: utf8test.c,v 1.5 2022/11/26 16:08:56 tb Exp $ */ /* * Copyright (c) 2014 Philip Guenther * @@ -24,7 +24,7 @@ #include #include -#include "asn1_locl.h" /* peek into the internals */ +#include "asn1_local.h" /* peek into the internals */ #define UNCHANGED 0xfedcba98 -- cgit v1.2.3-55-g6feb