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/pem | |
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/pem')
-rw-r--r-- | src/lib/libcrypto/pem/pem_info.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pem_pkey.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pvkfmt.c | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c index aecdbb2e05..3cca828cfd 100644 --- a/src/lib/libcrypto/pem/pem_info.c +++ b/src/lib/libcrypto/pem/pem_info.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pem_info.c,v 1.25 2021/12/12 21:30:14 tb Exp $ */ | 1 | /* $OpenBSD: pem_info.c,v 1.26 2022/11/26 16:08:53 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 | * |
@@ -75,7 +75,7 @@ | |||
75 | #include <openssl/rsa.h> | 75 | #include <openssl/rsa.h> |
76 | #endif | 76 | #endif |
77 | 77 | ||
78 | #include "evp_locl.h" | 78 | #include "evp_local.h" |
79 | 79 | ||
80 | STACK_OF(X509_INFO) * | 80 | STACK_OF(X509_INFO) * |
81 | PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, | 81 | PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, |
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 7076023eba..72cdd41b0d 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pem_lib.c,v 1.51 2022/07/31 09:48:27 tb Exp $ */ | 1 | /* $OpenBSD: pem_lib.c,v 1.52 2022/11/26 16:08:53 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 | * |
@@ -78,8 +78,8 @@ | |||
78 | #include <openssl/engine.h> | 78 | #include <openssl/engine.h> |
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | #include "asn1_locl.h" | 81 | #include "asn1_local.h" |
82 | #include "evp_locl.h" | 82 | #include "evp_local.h" |
83 | 83 | ||
84 | #define MIN_LENGTH 4 | 84 | #define MIN_LENGTH 4 |
85 | 85 | ||
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c index 2e5800394e..fa2d38f566 100644 --- a/src/lib/libcrypto/pem/pem_pkey.c +++ b/src/lib/libcrypto/pem/pem_pkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pem_pkey.c,v 1.25 2021/12/24 12:59:18 tb Exp $ */ | 1 | /* $OpenBSD: pem_pkey.c,v 1.26 2022/11/26 16:08:53 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 | * |
@@ -73,8 +73,8 @@ | |||
73 | #include <openssl/engine.h> | 73 | #include <openssl/engine.h> |
74 | #endif | 74 | #endif |
75 | 75 | ||
76 | #include "asn1_locl.h" | 76 | #include "asn1_local.h" |
77 | #include "evp_locl.h" | 77 | #include "evp_local.h" |
78 | 78 | ||
79 | int pem_check_suffix(const char *pem_str, const char *suffix); | 79 | int pem_check_suffix(const char *pem_str, const char *suffix); |
80 | 80 | ||
diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c index dffe1a362c..1417a7b3c0 100644 --- a/src/lib/libcrypto/pem/pvkfmt.c +++ b/src/lib/libcrypto/pem/pvkfmt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pvkfmt.c,v 1.25 2022/01/07 09:55:31 tb Exp $ */ | 1 | /* $OpenBSD: pvkfmt.c,v 1.26 2022/11/26 16:08:53 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2005. | 3 | * project 2005. |
4 | */ | 4 | */ |
@@ -73,10 +73,10 @@ | |||
73 | #include <openssl/dsa.h> | 73 | #include <openssl/dsa.h> |
74 | #include <openssl/rsa.h> | 74 | #include <openssl/rsa.h> |
75 | 75 | ||
76 | #include "bn_lcl.h" | 76 | #include "bn_local.h" |
77 | #include "dsa_locl.h" | 77 | #include "dsa_local.h" |
78 | #include "evp_locl.h" | 78 | #include "evp_local.h" |
79 | #include "rsa_locl.h" | 79 | #include "rsa_local.h" |
80 | 80 | ||
81 | /* Utility function: read a DWORD (4 byte unsigned integer) in little endian | 81 | /* Utility function: read a DWORD (4 byte unsigned integer) in little endian |
82 | * format | 82 | * format |