diff options
author | tb <> | 2024-03-02 10:13:13 +0000 |
---|---|---|
committer | tb <> | 2024-03-02 10:13:13 +0000 |
commit | d7a8734f3bc8f273ccc2d8c7425ebf2f744118af (patch) | |
tree | 7c88586c01b489d8d1d146f3e29fe0056bdd8436 /src/lib/libcrypto/evp/evp_names.c | |
parent | bb2222e671a46a72a1bbbf44ad27a1183debd4a0 (diff) | |
download | openbsd-d7a8734f3bc8f273ccc2d8c7425ebf2f744118af.tar.gz openbsd-d7a8734f3bc8f273ccc2d8c7425ebf2f744118af.tar.bz2 openbsd-d7a8734f3bc8f273ccc2d8c7425ebf2f744118af.zip |
Remove RC4-HMAC-MD5 and AES-{128,256}-CBC-HMAC-SHA-1
"Stitched" mode AEADs were removed from libssl a long time ago. Nothing
uses these CIPHERs anymore.
ok jsing
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/evp/evp_names.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/lib/libcrypto/evp/evp_names.c b/src/lib/libcrypto/evp/evp_names.c index ec66c12082..2936c36622 100644 --- a/src/lib/libcrypto/evp/evp_names.c +++ b/src/lib/libcrypto/evp/evp_names.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_names.c,v 1.11 2024/03/02 09:43:10 tb Exp $ */ | 1 | /* $OpenBSD: evp_names.c,v 1.12 2024/03/02 10:13:13 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> |
4 | * | 4 | * |
@@ -52,10 +52,6 @@ static const struct cipher_name cipher_names[] = { | |||
52 | .cipher = EVP_aes_128_cbc, | 52 | .cipher = EVP_aes_128_cbc, |
53 | }, | 53 | }, |
54 | { | 54 | { |
55 | .name = SN_aes_128_cbc_hmac_sha1, | ||
56 | .cipher = EVP_aes_128_cbc_hmac_sha1, | ||
57 | }, | ||
58 | { | ||
59 | .name = SN_aes_128_cfb128, | 55 | .name = SN_aes_128_cfb128, |
60 | .cipher = EVP_aes_128_cfb128, | 56 | .cipher = EVP_aes_128_cfb128, |
61 | }, | 57 | }, |
@@ -118,10 +114,6 @@ static const struct cipher_name cipher_names[] = { | |||
118 | .cipher = EVP_aes_256_cbc, | 114 | .cipher = EVP_aes_256_cbc, |
119 | }, | 115 | }, |
120 | { | 116 | { |
121 | .name = SN_aes_256_cbc_hmac_sha1, | ||
122 | .cipher = EVP_aes_256_cbc_hmac_sha1, | ||
123 | }, | ||
124 | { | ||
125 | .name = SN_aes_256_cfb128, | 117 | .name = SN_aes_256_cfb128, |
126 | .cipher = EVP_aes_256_cfb128, | 118 | .cipher = EVP_aes_256_cfb128, |
127 | }, | 119 | }, |
@@ -497,10 +489,6 @@ static const struct cipher_name cipher_names[] = { | |||
497 | .name = SN_rc4_40, | 489 | .name = SN_rc4_40, |
498 | .cipher = EVP_rc4_40, | 490 | .cipher = EVP_rc4_40, |
499 | }, | 491 | }, |
500 | { | ||
501 | .name = SN_rc4_hmac_md5, | ||
502 | .cipher = EVP_rc4_hmac_md5, | ||
503 | }, | ||
504 | #endif /* OPENSSL_NO_RC4 */ | 492 | #endif /* OPENSSL_NO_RC4 */ |
505 | 493 | ||
506 | #ifndef OPENSSL_NO_SM4 | 494 | #ifndef OPENSSL_NO_SM4 |
@@ -538,10 +526,6 @@ static const struct cipher_name cipher_names[] = { | |||
538 | .cipher = EVP_aes_128_cbc, | 526 | .cipher = EVP_aes_128_cbc, |
539 | }, | 527 | }, |
540 | { | 528 | { |
541 | .name = LN_aes_128_cbc_hmac_sha1, | ||
542 | .cipher = EVP_aes_128_cbc_hmac_sha1, | ||
543 | }, | ||
544 | { | ||
545 | .name = LN_aes_128_ccm, | 529 | .name = LN_aes_128_ccm, |
546 | .cipher = EVP_aes_128_ccm, | 530 | .cipher = EVP_aes_128_ccm, |
547 | }, | 531 | }, |
@@ -620,10 +604,6 @@ static const struct cipher_name cipher_names[] = { | |||
620 | .cipher = EVP_aes_256_cbc, | 604 | .cipher = EVP_aes_256_cbc, |
621 | }, | 605 | }, |
622 | { | 606 | { |
623 | .name = LN_aes_256_cbc_hmac_sha1, | ||
624 | .cipher = EVP_aes_256_cbc_hmac_sha1, | ||
625 | }, | ||
626 | { | ||
627 | .name = LN_aes_256_ccm, | 607 | .name = LN_aes_256_ccm, |
628 | .cipher = EVP_aes_256_ccm, | 608 | .cipher = EVP_aes_256_ccm, |
629 | }, | 609 | }, |
@@ -1060,10 +1040,6 @@ static const struct cipher_name cipher_names[] = { | |||
1060 | .name = LN_rc4_40, | 1040 | .name = LN_rc4_40, |
1061 | .cipher = EVP_rc4_40, | 1041 | .cipher = EVP_rc4_40, |
1062 | }, | 1042 | }, |
1063 | { | ||
1064 | .name = LN_rc4_hmac_md5, | ||
1065 | .cipher = EVP_rc4_hmac_md5, | ||
1066 | }, | ||
1067 | #endif /* OPENSSL_NO_RC4 */ | 1043 | #endif /* OPENSSL_NO_RC4 */ |
1068 | 1044 | ||
1069 | #ifndef OPENSSL_NO_SM4 | 1045 | #ifndef OPENSSL_NO_SM4 |