diff options
author | Pauli <paul.dale@oracle.com> | 2020-09-30 14:20:14 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-10-07 09:04:51 +1000 |
commit | 23b2fc0b501d6635dd821014aec8ff16689cbb6a (patch) | |
tree | 43e80f2bc60edcddd02ccd2316ca8d218051dca4 /providers/common | |
parent | a21db568bf3d0ab4194fd3e0917ee982f1fc8bfd (diff) |
rsa: add ossl_ prefix to internal rsa_ calls.
The functions being:
rsa_check_crt_components, rsa_check_key, rsa_check_pminusq_diff,
rsa_check_prime_factor, rsa_check_prime_factor_range,
rsa_check_private_exponent, rsa_check_public_exponent,
rsa_digestinfo_encoding, rsa_fips186_4_gen_prob_primes, rsa_fromdata,
rsa_get0_all_params, rsa_get0_libctx, rsa_get0_pss_params_30,
rsa_get_lcm, rsa_mgf_nid2name, rsa_mp_coeff_names, rsa_mp_exp_names,
rsa_mp_factor_names, rsa_new_with_ctx, rsa_oaeppss_md2nid,
rsa_oaeppss_nid2name, rsa_padding_add_PKCS1_OAEP_mgf1_with_libctx,
rsa_padding_add_PKCS1_type_2_with_libctx,
rsa_padding_add_SSLv23_with_libctx, rsa_padding_check_PKCS1_type_2_TLS,
rsa_pkey_method, rsa_pss_params_30_copy, rsa_pss_params_30_fromdata,
rsa_pss_params_30_hashalg, rsa_pss_params_30_is_unrestricted,
rsa_pss_params_30_maskgenalg, rsa_pss_params_30_maskgenhashalg,
rsa_pss_params_30_saltlen, rsa_pss_params_30_set_defaults,
rsa_pss_params_30_set_hashalg, rsa_pss_params_30_set_maskgenalg,
rsa_pss_params_30_set_maskgenhashalg, rsa_pss_params_30_set_saltlen,
rsa_pss_params_30_set_trailerfield, rsa_pss_params_30_todata,
rsa_pss_params_30_trailerfield, rsa_pss_pkey_method, rsa_set0_all_params,
rsa_sp800_56b_check_keypair, rsa_sp800_56b_check_private,
rsa_sp800_56b_check_public, rsa_sp800_56b_derive_params_from_pq,
rsa_sp800_56b_generate_key, rsa_sp800_56b_pairwise_test,
rsa_sp800_56b_validate_strength, rsa_todata, rsa_validate_pairwise,
rsa_validate_private and rsa_validate_public.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13040)
Diffstat (limited to 'providers/common')
-rw-r--r-- | providers/common/der/der_rsa_key.c | 23 | ||||
-rw-r--r-- | providers/common/include/prov/securitycheck.h | 2 | ||||
-rw-r--r-- | providers/common/securitycheck.c | 2 |
3 files changed, 14 insertions, 13 deletions
diff --git a/providers/common/der/der_rsa_key.c b/providers/common/der/der_rsa_key.c index 6e8a37699d..a20c334b23 100644 --- a/providers/common/der/der_rsa_key.c +++ b/providers/common/der/der_rsa_key.c @@ -242,8 +242,8 @@ static const unsigned char der_aid_mgf1SHA512_256Identifier[] = { static int DER_w_MaskGenAlgorithm(WPACKET *pkt, int tag, const RSA_PSS_PARAMS_30 *pss) { - if (pss != NULL && rsa_pss_params_30_maskgenalg(pss) == NID_mgf1) { - int maskgenhashalg_nid = rsa_pss_params_30_maskgenhashalg(pss); + if (pss != NULL && ossl_rsa_pss_params_30_maskgenalg(pss) == NID_mgf1) { + int maskgenhashalg_nid = ossl_rsa_pss_params_30_maskgenhashalg(pss); const unsigned char *maskgenalg = NULL; size_t maskgenalg_sz = 0; @@ -292,17 +292,18 @@ int ossl_DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag, * intent. Therefore, we assert that here, the PSS parameters must show * that the key is restricted. */ - if (!ossl_assert(pss != NULL && !rsa_pss_params_30_is_unrestricted(pss))) + if (!ossl_assert(pss != NULL + && !ossl_rsa_pss_params_30_is_unrestricted(pss))) return 0; - hashalg_nid = rsa_pss_params_30_hashalg(pss); - saltlen = rsa_pss_params_30_saltlen(pss); - trailerfield = rsa_pss_params_30_trailerfield(pss); + hashalg_nid = ossl_rsa_pss_params_30_hashalg(pss); + saltlen = ossl_rsa_pss_params_30_saltlen(pss); + trailerfield = ossl_rsa_pss_params_30_trailerfield(pss); /* Getting default values */ - default_hashalg_nid = rsa_pss_params_30_hashalg(NULL); - default_saltlen = rsa_pss_params_30_saltlen(NULL); - default_trailerfield = rsa_pss_params_30_trailerfield(NULL); + default_hashalg_nid = ossl_rsa_pss_params_30_hashalg(NULL); + default_saltlen = ossl_rsa_pss_params_30_saltlen(NULL); + default_trailerfield = ossl_rsa_pss_params_30_trailerfield(NULL); /* * From https://tools.ietf.org/html/rfc8017#appendix-A.2.1: @@ -354,7 +355,7 @@ int ossl_DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa) int rsa_nid = NID_undef; const unsigned char *rsa_oid = NULL; size_t rsa_oid_sz = 0; - RSA_PSS_PARAMS_30 *pss_params = rsa_get0_pss_params_30(rsa); + RSA_PSS_PARAMS_30 *pss_params = ossl_rsa_get0_pss_params_30(rsa); switch (RSA_test_flags(rsa, RSA_FLAG_TYPE_MASK)) { case RSA_FLAG_TYPE_RSA: @@ -368,7 +369,7 @@ int ossl_DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa) return ossl_DER_w_begin_sequence(pkt, tag) && (rsa_nid != NID_rsassaPss - || rsa_pss_params_30_is_unrestricted(pss_params) + || ossl_rsa_pss_params_30_is_unrestricted(pss_params) || ossl_DER_w_RSASSA_PSS_params(pkt, -1, pss_params)) && ossl_DER_w_precompiled(pkt, -1, rsa_oid, rsa_oid_sz) && ossl_DER_w_end_sequence(pkt, tag); diff --git a/providers/common/include/prov/securitycheck.h b/providers/common/include/prov/securitycheck.h index 0d3b9e8bac..8ab3370263 100644 --- a/providers/common/include/prov/securitycheck.h +++ b/providers/common/include/prov/securitycheck.h @@ -8,7 +8,7 @@ */ /* Functions that are common */ -int rsa_check_key(const RSA *rsa, int protect); +int ossl_rsa_check_key(const RSA *rsa, int protect); int ec_check_key(const EC_KEY *ec, int protect); int dsa_check_key(const DSA *dsa, int sign); int dh_check_key(const DH *dh); diff --git a/providers/common/securitycheck.c b/providers/common/securitycheck.c index 9a425fb630..a95fa9dda9 100644 --- a/providers/common/securitycheck.c +++ b/providers/common/securitycheck.c @@ -25,7 +25,7 @@ * Set protect = 1 for encryption or signing operations, or 0 otherwise. See * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf. */ -int rsa_check_key(const RSA *rsa, int protect) +int ossl_rsa_check_key(const RSA *rsa, int protect) { #if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS) if (securitycheck_enabled()) { |