diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-02-22 12:55:25 -0500 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-03-01 10:56:12 +0100 |
| commit | b0aae913246af1d07e728d24f53f55028f61c696 (patch) | |
| tree | 472478434dd9894a817e00d4eb56dd8197cc717a /providers | |
| parent | d546e8e267bfddc1ca310dfa8b9a72ab4f9aac7c (diff) | |
Remove RSA SSLv23 padding mode
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14248)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/asymciphers/rsa_enc.c | 1 | ||||
| -rw-r--r-- | providers/implementations/signature/rsa.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c index 461dee8c6d..5484c3d54a 100644 --- a/providers/implementations/asymciphers/rsa_enc.c +++ b/providers/implementations/asymciphers/rsa_enc.c @@ -47,7 +47,6 @@ static OSSL_FUNC_asym_cipher_settable_ctx_params_fn rsa_settable_ctx_params; static OSSL_ITEM padding_item[] = { { RSA_PKCS1_PADDING, OSSL_PKEY_RSA_PAD_MODE_PKCSV15 }, - { RSA_SSLV23_PADDING, OSSL_PKEY_RSA_PAD_MODE_SSLV23 }, { RSA_NO_PADDING, OSSL_PKEY_RSA_PAD_MODE_NONE }, { RSA_PKCS1_OAEP_PADDING, OSSL_PKEY_RSA_PAD_MODE_OAEP }, /* Correct spelling first */ { RSA_PKCS1_OAEP_PADDING, "oeap" }, diff --git a/providers/implementations/signature/rsa.c b/providers/implementations/signature/rsa.c index a19dc0129c..ca1510e718 100644 --- a/providers/implementations/signature/rsa.c +++ b/providers/implementations/signature/rsa.c @@ -61,7 +61,6 @@ static OSSL_FUNC_signature_settable_ctx_md_params_fn rsa_settable_ctx_md_params; static OSSL_ITEM padding_item[] = { { RSA_PKCS1_PADDING, OSSL_PKEY_RSA_PAD_MODE_PKCSV15 }, - { RSA_SSLV23_PADDING, OSSL_PKEY_RSA_PAD_MODE_SSLV23 }, { RSA_NO_PADDING, OSSL_PKEY_RSA_PAD_MODE_NONE }, { RSA_X931_PADDING, OSSL_PKEY_RSA_PAD_MODE_X931 }, { RSA_PKCS1_PSS_PADDING, OSSL_PKEY_RSA_PAD_MODE_PSS }, @@ -1187,9 +1186,6 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[]) case RSA_PKCS1_PADDING: err_extra_text = "PKCS#1 padding not allowed with RSA-PSS"; goto cont; - case RSA_SSLV23_PADDING: - err_extra_text = "SSLv3 padding not allowed with RSA-PSS"; - goto cont; case RSA_NO_PADDING: err_extra_text = "No padding not allowed with RSA-PSS"; goto cont; |