diff options
| author | tb <> | 2022-11-26 16:08:57 +0000 |
|---|---|---|
| committer | tb <> | 2022-11-26 16:08:57 +0000 |
| commit | 81d98bf600a381a625eb11b39a725b08c0ba547f (patch) | |
| tree | 556ebf909e81599dc3d8da585217d1576eabe0e4 /src/lib/libcrypto/objects | |
| parent | 9171ca1447e11e58ff2d00ba6d28293a138ae41a (diff) | |
| download | openbsd-81d98bf600a381a625eb11b39a725b08c0ba547f.tar.gz openbsd-81d98bf600a381a625eb11b39a725b08c0ba547f.tar.bz2 openbsd-81d98bf600a381a625eb11b39a725b08c0ba547f.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/objects')
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/objects/obj_lib.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index bcb7ee2dbb..b42d0e5e9c 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: obj_dat.c,v 1.49 2022/03/19 17:49:32 jsing Exp $ */ | 1 | /* $OpenBSD: obj_dat.c,v 1.50 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 | * |
| @@ -69,7 +69,7 @@ | |||
| 69 | #include <openssl/lhash.h> | 69 | #include <openssl/lhash.h> |
| 70 | #include <openssl/objects.h> | 70 | #include <openssl/objects.h> |
| 71 | 71 | ||
| 72 | #include "asn1_locl.h" | 72 | #include "asn1_local.h" |
| 73 | 73 | ||
| 74 | /* obj_dat.h is generated from objects.h by obj_dat.pl */ | 74 | /* obj_dat.h is generated from objects.h by obj_dat.pl */ |
| 75 | #include "obj_dat.h" | 75 | #include "obj_dat.h" |
diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c index 39cd41249f..eb06adfb92 100644 --- a/src/lib/libcrypto/objects/obj_lib.c +++ b/src/lib/libcrypto/objects/obj_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: obj_lib.c,v 1.16 2022/01/07 11:13:54 tb Exp $ */ | 1 | /* $OpenBSD: obj_lib.c,v 1.17 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 | * |
| @@ -64,7 +64,7 @@ | |||
| 64 | #include <openssl/lhash.h> | 64 | #include <openssl/lhash.h> |
| 65 | #include <openssl/objects.h> | 65 | #include <openssl/objects.h> |
| 66 | 66 | ||
| 67 | #include "asn1_locl.h" | 67 | #include "asn1_local.h" |
| 68 | 68 | ||
| 69 | ASN1_OBJECT * | 69 | ASN1_OBJECT * |
| 70 | OBJ_dup(const ASN1_OBJECT *o) | 70 | OBJ_dup(const ASN1_OBJECT *o) |
