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/modes | |
| 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/modes')
| -rw-r--r-- | src/lib/libcrypto/modes/cbc128.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/ccm128.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/cfb128.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/ctr128.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/cts128.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/gcm128.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/modes_local.h (renamed from src/lib/libcrypto/modes/modes_lcl.h) | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/ofb128.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/modes/xts128.c | 4 |
9 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/libcrypto/modes/cbc128.c b/src/lib/libcrypto/modes/cbc128.c index c5cf5a632d..f2eebc6e7a 100644 --- a/src/lib/libcrypto/modes/cbc128.c +++ b/src/lib/libcrypto/modes/cbc128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cbc128.c,v 1.5 2022/01/22 00:45:17 inoguchi Exp $ */ | 1 | /* $OpenBSD: cbc128.c,v 1.6 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -50,7 +50,7 @@ | |||
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <openssl/crypto.h> | 52 | #include <openssl/crypto.h> |
| 53 | #include "modes_lcl.h" | 53 | #include "modes_local.h" |
| 54 | #include <string.h> | 54 | #include <string.h> |
| 55 | 55 | ||
| 56 | #ifndef MODES_DEBUG | 56 | #ifndef MODES_DEBUG |
diff --git a/src/lib/libcrypto/modes/ccm128.c b/src/lib/libcrypto/modes/ccm128.c index 12c6e61659..978259e1ba 100644 --- a/src/lib/libcrypto/modes/ccm128.c +++ b/src/lib/libcrypto/modes/ccm128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ccm128.c,v 1.5 2019/05/08 14:18:25 tb Exp $ */ | 1 | /* $OpenBSD: ccm128.c,v 1.6 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -49,7 +49,7 @@ | |||
| 49 | */ | 49 | */ |
| 50 | 50 | ||
| 51 | #include <openssl/crypto.h> | 51 | #include <openssl/crypto.h> |
| 52 | #include "modes_lcl.h" | 52 | #include "modes_local.h" |
| 53 | #include <string.h> | 53 | #include <string.h> |
| 54 | 54 | ||
| 55 | #ifndef MODES_DEBUG | 55 | #ifndef MODES_DEBUG |
diff --git a/src/lib/libcrypto/modes/cfb128.c b/src/lib/libcrypto/modes/cfb128.c index 8399f0c5be..8555ce0552 100644 --- a/src/lib/libcrypto/modes/cfb128.c +++ b/src/lib/libcrypto/modes/cfb128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cfb128.c,v 1.4 2015/02/10 09:46:30 miod Exp $ */ | 1 | /* $OpenBSD: cfb128.c,v 1.5 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -50,7 +50,7 @@ | |||
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <openssl/crypto.h> | 52 | #include <openssl/crypto.h> |
| 53 | #include "modes_lcl.h" | 53 | #include "modes_local.h" |
| 54 | #include <string.h> | 54 | #include <string.h> |
| 55 | 55 | ||
| 56 | #ifndef MODES_DEBUG | 56 | #ifndef MODES_DEBUG |
diff --git a/src/lib/libcrypto/modes/ctr128.c b/src/lib/libcrypto/modes/ctr128.c index 23979d64f1..9dd8c0c55e 100644 --- a/src/lib/libcrypto/modes/ctr128.c +++ b/src/lib/libcrypto/modes/ctr128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ctr128.c,v 1.7 2017/08/13 17:46:24 bcook Exp $ */ | 1 | /* $OpenBSD: ctr128.c,v 1.8 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -50,7 +50,7 @@ | |||
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <openssl/crypto.h> | 52 | #include <openssl/crypto.h> |
| 53 | #include "modes_lcl.h" | 53 | #include "modes_local.h" |
| 54 | #include <string.h> | 54 | #include <string.h> |
| 55 | 55 | ||
| 56 | #ifndef MODES_DEBUG | 56 | #ifndef MODES_DEBUG |
diff --git a/src/lib/libcrypto/modes/cts128.c b/src/lib/libcrypto/modes/cts128.c index 802aa77cd5..ec81dd2433 100644 --- a/src/lib/libcrypto/modes/cts128.c +++ b/src/lib/libcrypto/modes/cts128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cts128.c,v 1.5 2015/07/19 18:27:26 miod Exp $ */ | 1 | /* $OpenBSD: cts128.c,v 1.6 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <openssl/crypto.h> | 9 | #include <openssl/crypto.h> |
| 10 | #include "modes_lcl.h" | 10 | #include "modes_local.h" |
| 11 | #include <string.h> | 11 | #include <string.h> |
| 12 | 12 | ||
| 13 | #ifndef MODES_DEBUG | 13 | #ifndef MODES_DEBUG |
diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c index 74362e6adc..36aac413c3 100644 --- a/src/lib/libcrypto/modes/gcm128.c +++ b/src/lib/libcrypto/modes/gcm128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: gcm128.c,v 1.22 2018/01/24 23:03:37 kettenis Exp $ */ | 1 | /* $OpenBSD: gcm128.c,v 1.23 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -51,7 +51,7 @@ | |||
| 51 | #define OPENSSL_FIPSAPI | 51 | #define OPENSSL_FIPSAPI |
| 52 | 52 | ||
| 53 | #include <openssl/crypto.h> | 53 | #include <openssl/crypto.h> |
| 54 | #include "modes_lcl.h" | 54 | #include "modes_local.h" |
| 55 | #include <string.h> | 55 | #include <string.h> |
| 56 | 56 | ||
| 57 | #ifndef MODES_DEBUG | 57 | #ifndef MODES_DEBUG |
diff --git a/src/lib/libcrypto/modes/modes_lcl.h b/src/lib/libcrypto/modes/modes_local.h index 91820897f7..943f139245 100644 --- a/src/lib/libcrypto/modes/modes_lcl.h +++ b/src/lib/libcrypto/modes/modes_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: modes_lcl.h,v 1.11 2021/11/09 18:40:21 bcook Exp $ */ | 1 | /* $OpenBSD: modes_local.h,v 1.1 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2010 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
diff --git a/src/lib/libcrypto/modes/ofb128.c b/src/lib/libcrypto/modes/ofb128.c index 1b8a6fd500..3cf5d98150 100644 --- a/src/lib/libcrypto/modes/ofb128.c +++ b/src/lib/libcrypto/modes/ofb128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ofb128.c,v 1.4 2015/02/10 09:46:30 miod Exp $ */ | 1 | /* $OpenBSD: ofb128.c,v 1.5 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2008 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -50,7 +50,7 @@ | |||
| 50 | */ | 50 | */ |
| 51 | 51 | ||
| 52 | #include <openssl/crypto.h> | 52 | #include <openssl/crypto.h> |
| 53 | #include "modes_lcl.h" | 53 | #include "modes_local.h" |
| 54 | #include <string.h> | 54 | #include <string.h> |
| 55 | 55 | ||
| 56 | #ifndef MODES_DEBUG | 56 | #ifndef MODES_DEBUG |
diff --git a/src/lib/libcrypto/modes/xts128.c b/src/lib/libcrypto/modes/xts128.c index 2084892ee6..dfd3bc434e 100644 --- a/src/lib/libcrypto/modes/xts128.c +++ b/src/lib/libcrypto/modes/xts128.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: xts128.c,v 1.8 2021/11/09 18:40:21 bcook Exp $ */ | 1 | /* $OpenBSD: xts128.c,v 1.9 2022/11/26 16:08:53 tb Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2011 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -49,7 +49,7 @@ | |||
| 49 | */ | 49 | */ |
| 50 | 50 | ||
| 51 | #include <openssl/crypto.h> | 51 | #include <openssl/crypto.h> |
| 52 | #include "modes_lcl.h" | 52 | #include "modes_local.h" |
| 53 | 53 | ||
| 54 | #include <endian.h> | 54 | #include <endian.h> |
| 55 | #include <string.h> | 55 | #include <string.h> |
