diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 10:14:45 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | 4158b0dc1d73ce73b9a924b77205f4d2b67abdc1 (patch) | |
| tree | f915fd1dcc71d716f0b93353dbb19af4dff052bc /providers | |
| parent | 2858156e0309031da8476e51fe76f0ce8c15010f (diff) | |
Add ossl_rsa symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/keymgmt/rsa_kmgmt.c | 6 | ||||
| -rw-r--r-- | providers/implementations/signature/rsa.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c index 46962c7ab8..1c4fb3bcd5 100644 --- a/providers/implementations/keymgmt/rsa_kmgmt.c +++ b/providers/implementations/keymgmt/rsa_kmgmt.c @@ -489,7 +489,7 @@ static int rsa_gen_set_params(void *genctx, const OSSL_PARAM params[]) return 0; #if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) /* Any ACVP test related parameters are copied into a params[] */ - if (!rsa_acvp_test_gen_params_new(&gctx->acvp_test_params, params)) + if (!ossl_rsa_acvp_test_gen_params_new(&gctx->acvp_test_params, params)) return 0; #endif return 1; @@ -571,7 +571,7 @@ static void *rsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg) #if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) if (gctx->acvp_test_params != NULL) { - if (!rsa_acvp_test_set_params(rsa_tmp, gctx->acvp_test_params)) + if (!ossl_rsa_acvp_test_set_params(rsa_tmp, gctx->acvp_test_params)) goto err; } #endif @@ -603,7 +603,7 @@ static void rsa_gen_cleanup(void *genctx) if (gctx == NULL) return; #if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) - rsa_acvp_test_gen_params_free(gctx->acvp_test_params); + ossl_rsa_acvp_test_gen_params_free(gctx->acvp_test_params); gctx->acvp_test_params = NULL; #endif BN_clear_free(gctx->pub_exp); diff --git a/providers/implementations/signature/rsa.c b/providers/implementations/signature/rsa.c index 0df079dc79..f521f0190d 100644 --- a/providers/implementations/signature/rsa.c +++ b/providers/implementations/signature/rsa.c @@ -691,8 +691,8 @@ static int rsa_verify_recover(void *vprsactx, { size_t sltmp; - ret = int_rsa_verify(prsactx->mdnid, NULL, 0, rout, &sltmp, - sig, siglen, prsactx->rsa); + ret = ossl_rsa_verify(prsactx->mdnid, NULL, 0, rout, &sltmp, + sig, siglen, prsactx->rsa); if (ret <= 0) { ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB); return 0; |