diff options
author | beck <> | 2024-07-09 07:16:13 +0000 |
---|---|---|
committer | beck <> | 2024-07-09 07:16:13 +0000 |
commit | acad707751e8096cfc7ce1c4421220e82ace3313 (patch) | |
tree | fce49a2e6431c29a2aaf1e75e6037527ee08ae0d | |
parent | eaf0cc7dfbcf508f10642a264a5e1d74a9276116 (diff) | |
download | openbsd-acad707751e8096cfc7ce1c4421220e82ace3313.tar.gz openbsd-acad707751e8096cfc7ce1c4421220e82ace3313.tar.bz2 openbsd-acad707751e8096cfc7ce1c4421220e82ace3313.zip |
Hide DES global variables
ok tb@
-rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/des/enc_read.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/des/set_key.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/des.h | 6 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index c5622dff33..8cdca7e427 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
@@ -3344,6 +3344,8 @@ _libre_X509_STORE_CTX_get_check_issued | |||
3344 | _libre_X509_STORE_get_check_issued | 3344 | _libre_X509_STORE_get_check_issued |
3345 | _libre_X509_STORE_set_check_issued | 3345 | _libre_X509_STORE_set_check_issued |
3346 | _libre_lh_error | 3346 | _libre_lh_error |
3347 | _libre_DES_check_key | ||
3348 | _libre_DES_rw_mode | ||
3347 | _libre_RSAPublicKey_it | 3349 | _libre_RSAPublicKey_it |
3348 | _libre_RSAPrivateKey_it | 3350 | _libre_RSAPrivateKey_it |
3349 | _libre_RSA_PSS_PARAMS_it | 3351 | _libre_RSA_PSS_PARAMS_it |
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c index 35704315e1..32f7547a3f 100644 --- a/src/lib/libcrypto/des/enc_read.c +++ b/src/lib/libcrypto/des/enc_read.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: enc_read.c,v 1.19 2024/05/24 19:16:53 tb Exp $ */ | 1 | /* $OpenBSD: enc_read.c,v 1.20 2024/07/09 07:16:13 beck 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 | * |
@@ -67,6 +67,7 @@ | |||
67 | */ | 67 | */ |
68 | 68 | ||
69 | int DES_rw_mode = DES_PCBC_MODE; | 69 | int DES_rw_mode = DES_PCBC_MODE; |
70 | LCRYPTO_ALIAS(DES_rw_mode); | ||
70 | 71 | ||
71 | int | 72 | int |
72 | DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, | 73 | DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, |
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c index 0e7aab688c..9a9dcf7c52 100644 --- a/src/lib/libcrypto/des/set_key.c +++ b/src/lib/libcrypto/des/set_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: set_key.c,v 1.27 2024/03/29 01:47:29 joshua Exp $ */ | 1 | /* $OpenBSD: set_key.c,v 1.28 2024/07/09 07:16:13 beck 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 | * |
@@ -63,6 +63,7 @@ | |||
63 | #include "des_local.h" | 63 | #include "des_local.h" |
64 | 64 | ||
65 | int DES_check_key = 0; /* defaults to false */ | 65 | int DES_check_key = 0; /* defaults to false */ |
66 | LCRYPTO_ALIAS(DES_check_key); | ||
66 | 67 | ||
67 | static const unsigned char odd_parity[256] = { | 68 | static const unsigned char odd_parity[256] = { |
68 | 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, | 69 | 1, 1, 2, 2, 4, 4, 7, 7, 8, 8, 11, 11, 13, 13, 14, 14, |
diff --git a/src/lib/libcrypto/hidden/openssl/des.h b/src/lib/libcrypto/hidden/openssl/des.h index 9f6ea9c104..e632de4b11 100644 --- a/src/lib/libcrypto/hidden/openssl/des.h +++ b/src/lib/libcrypto/hidden/openssl/des.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: des.h,v 1.1 2024/03/29 01:47:29 joshua Exp $ */ | 1 | /* $OpenBSD: des.h,v 1.2 2024/07/09 07:16:13 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joshua Sing <joshua@joshuasing.dev> | 3 | * Copyright (c) 2024 Joshua Sing <joshua@joshuasing.dev> |
4 | * | 4 | * |
@@ -60,5 +60,9 @@ LCRYPTO_USED(DES_string_to_key); | |||
60 | LCRYPTO_USED(DES_string_to_2keys); | 60 | LCRYPTO_USED(DES_string_to_2keys); |
61 | LCRYPTO_USED(DES_cfb64_encrypt); | 61 | LCRYPTO_USED(DES_cfb64_encrypt); |
62 | LCRYPTO_USED(DES_ofb64_encrypt); | 62 | LCRYPTO_USED(DES_ofb64_encrypt); |
63 | #if defined(LIBRESSL_NAMESPACE) | ||
64 | extern LCRYPTO_USED(DES_check_key); | ||
65 | extern LCRYPTO_USED(DES_rw_mode); | ||
66 | #endif | ||
63 | 67 | ||
64 | #endif /* _LIBCRYPTO_DES_H */ | 68 | #endif /* _LIBCRYPTO_DES_H */ |