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/sm2 | |
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/sm2')
-rw-r--r-- | src/lib/libcrypto/sm2/sm2_crypt.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/sm2/sm2_local.h (renamed from src/lib/libcrypto/sm2/sm2_locl.h) | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/sm2/sm2_pmeth.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/sm2/sm2_sign.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/sm2/sm2_crypt.c b/src/lib/libcrypto/sm2/sm2_crypt.c index 2bb3b8ff63..b51161d640 100644 --- a/src/lib/libcrypto/sm2/sm2_crypt.c +++ b/src/lib/libcrypto/sm2/sm2_crypt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sm2_crypt.c,v 1.1.1.1 2021/08/18 16:04:32 tb Exp $ */ | 1 | /* $OpenBSD: sm2_crypt.c,v 1.2 2022/11/26 16:08:54 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017, 2019 Ribose Inc | 3 | * Copyright (c) 2017, 2019 Ribose Inc |
4 | * | 4 | * |
@@ -26,7 +26,7 @@ | |||
26 | #include <openssl/evp.h> | 26 | #include <openssl/evp.h> |
27 | #include <openssl/sm2.h> | 27 | #include <openssl/sm2.h> |
28 | 28 | ||
29 | #include "sm2_locl.h" | 29 | #include "sm2_local.h" |
30 | 30 | ||
31 | typedef struct SM2_Ciphertext_st SM2_Ciphertext; | 31 | typedef struct SM2_Ciphertext_st SM2_Ciphertext; |
32 | 32 | ||
diff --git a/src/lib/libcrypto/sm2/sm2_locl.h b/src/lib/libcrypto/sm2/sm2_local.h index 2e1626824f..c934263190 100644 --- a/src/lib/libcrypto/sm2/sm2_locl.h +++ b/src/lib/libcrypto/sm2/sm2_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sm2_locl.h,v 1.1.1.1 2021/08/18 16:04:32 tb Exp $ */ | 1 | /* $OpenBSD: sm2_local.h,v 1.1 2022/11/26 16:08:54 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017, 2019 Ribose Inc | 3 | * Copyright (c) 2017, 2019 Ribose Inc |
4 | * | 4 | * |
diff --git a/src/lib/libcrypto/sm2/sm2_pmeth.c b/src/lib/libcrypto/sm2/sm2_pmeth.c index af6e180a70..441f5475d1 100644 --- a/src/lib/libcrypto/sm2/sm2_pmeth.c +++ b/src/lib/libcrypto/sm2/sm2_pmeth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sm2_pmeth.c,v 1.1.1.1 2021/08/18 16:04:32 tb Exp $ */ | 1 | /* $OpenBSD: sm2_pmeth.c,v 1.2 2022/11/26 16:08:54 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017, 2019 Ribose Inc | 3 | * Copyright (c) 2017, 2019 Ribose Inc |
4 | * | 4 | * |
@@ -25,8 +25,8 @@ | |||
25 | #include <openssl/err.h> | 25 | #include <openssl/err.h> |
26 | #include <openssl/evp.h> | 26 | #include <openssl/evp.h> |
27 | 27 | ||
28 | #include "evp_locl.h" | 28 | #include "evp_local.h" |
29 | #include "sm2_locl.h" | 29 | #include "sm2_local.h" |
30 | 30 | ||
31 | /* SM2 pkey context structure */ | 31 | /* SM2 pkey context structure */ |
32 | 32 | ||
diff --git a/src/lib/libcrypto/sm2/sm2_sign.c b/src/lib/libcrypto/sm2/sm2_sign.c index b35de841b1..5d929e57aa 100644 --- a/src/lib/libcrypto/sm2/sm2_sign.c +++ b/src/lib/libcrypto/sm2/sm2_sign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sm2_sign.c,v 1.2 2022/01/20 11:12:14 inoguchi Exp $ */ | 1 | /* $OpenBSD: sm2_sign.c,v 1.3 2022/11/26 16:08:54 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017, 2019 Ribose Inc | 3 | * Copyright (c) 2017, 2019 Ribose Inc |
4 | * | 4 | * |
@@ -24,8 +24,8 @@ | |||
24 | #include <openssl/err.h> | 24 | #include <openssl/err.h> |
25 | #include <openssl/bn.h> | 25 | #include <openssl/bn.h> |
26 | 26 | ||
27 | #include "bn_lcl.h" | 27 | #include "bn_local.h" |
28 | #include "sm2_locl.h" | 28 | #include "sm2_local.h" |
29 | 29 | ||
30 | static BIGNUM * | 30 | static BIGNUM * |
31 | sm2_compute_msg_hash(const EVP_MD *digest, const EC_KEY *key, | 31 | sm2_compute_msg_hash(const EVP_MD *digest, const EC_KEY *key, |