diff options
| author | tb <> | 2024-04-20 10:11:55 +0000 |
|---|---|---|
| committer | tb <> | 2024-04-20 10:11:55 +0000 |
| commit | 4ddaece10d141b284039f88922f4066d31cdbf0a (patch) | |
| tree | 43799aaf040c4a6a7ec86ff4d4ee64e572ce6b9d | |
| parent | b462ba431c51cb75197a129df5284f4335a6ee06 (diff) | |
| download | openbsd-4ddaece10d141b284039f88922f4066d31cdbf0a.tar.gz openbsd-4ddaece10d141b284039f88922f4066d31cdbf0a.tar.bz2 openbsd-4ddaece10d141b284039f88922f4066d31cdbf0a.zip | |
Remove more unnecessary GOST code
ok jsing
| -rw-r--r-- | src/lib/libcrypto/cms/cms_sd.c | 12 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_smime.c | 14 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c index b783941911..9cdd4ce143 100644 --- a/src/lib/libcrypto/cms/cms_sd.c +++ b/src/lib/libcrypto/cms/cms_sd.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms_sd.c,v 1.32 2024/04/07 06:34:42 tb Exp $ */ | 1 | /* $OpenBSD: cms_sd.c,v 1.33 2024/04/20 10:11:55 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 4 | * project. | 4 | * project. |
| @@ -1070,20 +1070,10 @@ cms_add_cipher_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg) | |||
| 1070 | return 1; | 1070 | return 1; |
| 1071 | } | 1071 | } |
| 1072 | 1072 | ||
| 1073 | static int | ||
| 1074 | cms_add_digest_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg) | ||
| 1075 | { | ||
| 1076 | if (EVP_get_digestbynid(nid)) | ||
| 1077 | return CMS_add_simple_smimecap(sk, nid, arg); | ||
| 1078 | return 1; | ||
| 1079 | } | ||
| 1080 | |||
| 1081 | int | 1073 | int |
| 1082 | CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap) | 1074 | CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap) |
| 1083 | { | 1075 | { |
| 1084 | if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) || | 1076 | if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) || |
| 1085 | !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1) || | ||
| 1086 | !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) || | ||
| 1087 | !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) || | 1077 | !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) || |
| 1088 | !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1) || | 1078 | !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1) || |
| 1089 | !cms_add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) || | 1079 | !cms_add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) || |
diff --git a/src/lib/libcrypto/pkcs7/pk7_smime.c b/src/lib/libcrypto/pkcs7/pk7_smime.c index c113ac3954..cff89c34e1 100644 --- a/src/lib/libcrypto/pkcs7/pk7_smime.c +++ b/src/lib/libcrypto/pkcs7/pk7_smime.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pk7_smime.c,v 1.26 2023/02/16 08:38:17 tb Exp $ */ | 1 | /* $OpenBSD: pk7_smime.c,v 1.27 2024/04/20 10:11:55 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project. | 3 | * project. |
| 4 | */ | 4 | */ |
| @@ -152,14 +152,6 @@ add_cipher_smcap(STACK_OF(X509_ALGOR) *sk, int nid, int arg) | |||
| 152 | return 1; | 152 | return 1; |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | static int | ||
| 156 | add_digest_smcap(STACK_OF(X509_ALGOR) *sk, int nid, int arg) | ||
| 157 | { | ||
| 158 | if (EVP_get_digestbynid(nid)) | ||
| 159 | return PKCS7_simple_smimecap(sk, nid, arg); | ||
| 160 | return 1; | ||
| 161 | } | ||
| 162 | |||
| 163 | PKCS7_SIGNER_INFO * | 155 | PKCS7_SIGNER_INFO * |
| 164 | PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert, EVP_PKEY *pkey, | 156 | PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert, EVP_PKEY *pkey, |
| 165 | const EVP_MD *md, int flags) | 157 | const EVP_MD *md, int flags) |
| @@ -192,10 +184,6 @@ PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert, EVP_PKEY *pkey, | |||
| 192 | goto err; | 184 | goto err; |
| 193 | } | 185 | } |
| 194 | if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1) || | 186 | if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1) || |
| 195 | !add_digest_smcap(smcap, NID_id_GostR3411_94, -1) || | ||
| 196 | !add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_256, -1) || | ||
| 197 | !add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_512, -1) || | ||
| 198 | !add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) || | ||
| 199 | !add_cipher_smcap(smcap, NID_aes_192_cbc, -1) || | 187 | !add_cipher_smcap(smcap, NID_aes_192_cbc, -1) || |
| 200 | !add_cipher_smcap(smcap, NID_aes_128_cbc, -1) || | 188 | !add_cipher_smcap(smcap, NID_aes_128_cbc, -1) || |
| 201 | !add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) || | 189 | !add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) || |