diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-05-26 10:05:01 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-05-27 12:42:20 +0200 |
| commit | f7f53d7d61bba235b8babf4cf580114d74183e3e (patch) | |
| tree | d282c6aec62e24f1d4bf6d7399d2afa2049a9623 | |
| parent | e978ab7894e966579fcd372d7cba9e051ba90150 (diff) | |
PROV: Use rsa_padding_add_PKCS1_OAEP_mgf1_with_libctx() in RSA-OAEP
Fixes #11904
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11959)
| -rw-r--r-- | crypto/rsa/rsa_local.h | 7 | ||||
| -rw-r--r-- | include/crypto/rsa.h | 7 | ||||
| -rw-r--r-- | providers/implementations/asymciphers/rsa_enc.c | 12 |
3 files changed, 14 insertions, 12 deletions
diff --git a/crypto/rsa/rsa_local.h b/crypto/rsa/rsa_local.h index f94fc79cdd..65fd6022f7 100644 --- a/crypto/rsa/rsa_local.h +++ b/crypto/rsa/rsa_local.h @@ -187,12 +187,5 @@ int rsa_padding_add_PKCS1_type_2_with_libctx(OPENSSL_CTX *libctx, unsigned char *to, int tlen, const unsigned char *from, int flen); -int rsa_padding_add_PKCS1_OAEP_mgf1_with_libctx(OPENSSL_CTX *libctx, - unsigned char *to, int tlen, - const unsigned char *from, - int flen, - const unsigned char *param, - int plen, const EVP_MD *md, - const EVP_MD *mgf1md); #endif /* OSSL_CRYPTO_RSA_LOCAL_H */ diff --git a/include/crypto/rsa.h b/include/crypto/rsa.h index 6f32ec422f..5d7a6e515d 100644 --- a/include/crypto/rsa.h +++ b/include/crypto/rsa.h @@ -69,6 +69,13 @@ int rsa_padding_check_PKCS1_type_2_TLS(OPENSSL_CTX *ctx, unsigned char *to, size_t tlen, const unsigned char *from, size_t flen, int client_version, int alt_version); +int rsa_padding_add_PKCS1_OAEP_mgf1_with_libctx(OPENSSL_CTX *libctx, + unsigned char *to, int tlen, + const unsigned char *from, + int flen, + const unsigned char *param, + int plen, const EVP_MD *md, + const EVP_MD *mgf1md); int rsa_validate_public(const RSA *key); int rsa_validate_private(const RSA *key); diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c index 1f9ded4a65..db89de8a26 100644 --- a/providers/implementations/asymciphers/rsa_enc.c +++ b/providers/implementations/asymciphers/rsa_enc.c @@ -138,11 +138,13 @@ static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen, PROVerr(0, ERR_R_INTERNAL_ERROR); return 0; } - ret = RSA_padding_add_PKCS1_OAEP_mgf1(tbuf, rsasize, in, inlen, - prsactx->oaep_label, - prsactx->oaep_labellen, - prsactx->oaep_md, - prsactx->mgf1_md); + ret = + rsa_padding_add_PKCS1_OAEP_mgf1_with_libctx(prsactx->libctx, tbuf, + rsasize, in, inlen, + prsactx->oaep_label, + prsactx->oaep_labellen, + prsactx->oaep_md, + prsactx->mgf1_md); if (!ret) { OPENSSL_free(tbuf); |