From: Richard Levitte Date: Thu, 28 Jan 2021 07:01:52 +0000 (+0100) Subject: Fix some odd names in our provider source code X-Git-Tag: openssl-3.0.0-alpha12~173 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f422f6f481ec7961fe762c97121b53abad3eb4;p=thirdparty%2Fopenssl.git Fix some odd names in our provider source code ecossl_dh_keyexch_functions -> ossl_ecdh_keyexch_functions ecossl_dsa_signature_functions -> ossl_ecdsa_signature_functions sm2_asym_cipher_functions -> ossl_sm2_asym_cipher_functions sm2_keymgmt_functions -> ossl_sm2_keymgmt_functions sm2_signature_functions -> ossl_sm2_signature_functions Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14028) --- diff --git a/providers/defltprov.c b/providers/defltprov.c index 3cd7dffee80..2a1ebb6218c 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -347,7 +347,7 @@ static const OSSL_ALGORITHM deflt_keyexch[] = { { "DH:dhKeyAgreement", "provider=default", ossl_dh_keyexch_functions }, #endif #ifndef OPENSSL_NO_EC - { "ECDH", "provider=default", ecossl_dh_keyexch_functions }, + { "ECDH", "provider=default", ossl_ecdh_keyexch_functions }, { "X25519", "provider=default", ossl_x25519_keyexch_functions }, { "X448", "provider=default", ossl_x448_keyexch_functions }, #endif @@ -375,9 +375,9 @@ static const OSSL_ALGORITHM deflt_signature[] = { #ifndef OPENSSL_NO_EC { "ED25519", "provider=default", ossl_ed25519_signature_functions }, { "ED448", "provider=default", ossl_ed448_signature_functions }, - { "ECDSA", "provider=default", ecossl_dsa_signature_functions }, + { "ECDSA", "provider=default", ossl_ecdsa_signature_functions }, # ifndef OPENSSL_NO_SM2 - { "SM2", "provider=default", sm2_signature_functions }, + { "SM2", "provider=default", ossl_sm2_signature_functions }, # endif #endif { "HMAC", "provider=default", ossl_mac_legacy_hmac_signature_functions }, @@ -396,7 +396,7 @@ static const OSSL_ALGORITHM deflt_signature[] = { static const OSSL_ALGORITHM deflt_asym_cipher[] = { { "RSA:rsaEncryption", "provider=default", ossl_rsa_asym_cipher_functions }, #ifndef OPENSSL_NO_SM2 - { "SM2", "provider=default", sm2_asym_cipher_functions }, + { "SM2", "provider=default", ossl_sm2_asym_cipher_functions }, #endif { NULL, NULL, NULL } }; @@ -436,7 +436,7 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = { { "CMAC", "provider=default", ossl_cossl_mac_legacy_keymgmt_functions }, #endif #ifndef OPENSSL_NO_SM2 - { "SM2", "provider=default", sm2_keymgmt_functions }, + { "SM2", "provider=default", ossl_sm2_keymgmt_functions }, #endif { NULL, NULL, NULL } }; diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index ba9363bf2e2..deffb88ba6b 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -350,7 +350,7 @@ static const OSSL_ALGORITHM fips_keyexch[] = { { "DH:dhKeyAgreement", FIPS_DEFAULT_PROPERTIES, ossl_dh_keyexch_functions }, #endif #ifndef OPENSSL_NO_EC - { "ECDH", FIPS_DEFAULT_PROPERTIES, ecossl_dh_keyexch_functions }, + { "ECDH", FIPS_DEFAULT_PROPERTIES, ossl_ecdh_keyexch_functions }, { "X25519", FIPS_DEFAULT_PROPERTIES, ossl_x25519_keyexch_functions }, { "X448", FIPS_DEFAULT_PROPERTIES, ossl_x448_keyexch_functions }, #endif @@ -370,7 +370,7 @@ static const OSSL_ALGORITHM fips_signature[] = { #ifndef OPENSSL_NO_EC { "ED25519", FIPS_DEFAULT_PROPERTIES, ossl_ed25519_signature_functions }, { "ED448", FIPS_DEFAULT_PROPERTIES, ossl_ed448_signature_functions }, - { "ECDSA", FIPS_DEFAULT_PROPERTIES, ecossl_dsa_signature_functions }, + { "ECDSA", FIPS_DEFAULT_PROPERTIES, ossl_ecdsa_signature_functions }, #endif { "HMAC", FIPS_DEFAULT_PROPERTIES, ossl_mac_legacy_hmac_signature_functions }, diff --git a/providers/implementations/asymciphers/sm2_enc.c b/providers/implementations/asymciphers/sm2_enc.c index 913c36fcfd1..3dd4d83838c 100644 --- a/providers/implementations/asymciphers/sm2_enc.c +++ b/providers/implementations/asymciphers/sm2_enc.c @@ -207,7 +207,7 @@ static const OSSL_PARAM *sm2_settable_ctx_params(ossl_unused void *provctx) return known_settable_ctx_params; } -const OSSL_DISPATCH sm2_asym_cipher_functions[] = { +const OSSL_DISPATCH ossl_sm2_asym_cipher_functions[] = { { OSSL_FUNC_ASYM_CIPHER_NEWCTX, (void (*)(void))sm2_newctx }, { OSSL_FUNC_ASYM_CIPHER_ENCRYPT_INIT, (void (*)(void))sm2_init }, { OSSL_FUNC_ASYM_CIPHER_ENCRYPT, (void (*)(void))sm2_asym_encrypt }, diff --git a/providers/implementations/exchange/ecdh_exch.c b/providers/implementations/exchange/ecdh_exch.c index d5f48597337..a1b17443baa 100644 --- a/providers/implementations/exchange/ecdh_exch.c +++ b/providers/implementations/exchange/ecdh_exch.c @@ -530,7 +530,7 @@ int ecdh_derive(void *vpecdhctx, unsigned char *secret, return 0; } -const OSSL_DISPATCH ecossl_dh_keyexch_functions[] = { +const OSSL_DISPATCH ossl_ecdh_keyexch_functions[] = { { OSSL_FUNC_KEYEXCH_NEWCTX, (void (*)(void))ecdh_newctx }, { OSSL_FUNC_KEYEXCH_INIT, (void (*)(void))ecdh_init }, { OSSL_FUNC_KEYEXCH_DERIVE, (void (*)(void))ecdh_derive }, diff --git a/providers/implementations/include/prov/implementations.h b/providers/implementations/include/prov/implementations.h index 936e825e33a..b83fddf5784 100644 --- a/providers/implementations/include/prov/implementations.h +++ b/providers/implementations/include/prov/implementations.h @@ -286,14 +286,14 @@ extern const OSSL_DISPATCH ossl_kdf_keymgmt_functions[]; extern const OSSL_DISPATCH ossl_mac_legacy_keymgmt_functions[]; extern const OSSL_DISPATCH ossl_cossl_mac_legacy_keymgmt_functions[]; #ifndef OPENSSL_NO_SM2 -extern const OSSL_DISPATCH sm2_keymgmt_functions[]; +extern const OSSL_DISPATCH ossl_sm2_keymgmt_functions[]; #endif /* Key Exchange */ extern const OSSL_DISPATCH ossl_dh_keyexch_functions[]; extern const OSSL_DISPATCH ossl_x25519_keyexch_functions[]; extern const OSSL_DISPATCH ossl_x448_keyexch_functions[]; -extern const OSSL_DISPATCH ecossl_dh_keyexch_functions[]; +extern const OSSL_DISPATCH ossl_ecdh_keyexch_functions[]; extern const OSSL_DISPATCH ossl_kdf_tls1_prf_keyexch_functions[]; extern const OSSL_DISPATCH ossl_kdf_hkdf_keyexch_functions[]; extern const OSSL_DISPATCH ossl_kdf_scrypt_keyexch_functions[]; @@ -303,17 +303,17 @@ extern const OSSL_DISPATCH ossl_dsa_signature_functions[]; extern const OSSL_DISPATCH ossl_rsa_signature_functions[]; extern const OSSL_DISPATCH ossl_ed25519_signature_functions[]; extern const OSSL_DISPATCH ossl_ed448_signature_functions[]; -extern const OSSL_DISPATCH ecossl_dsa_signature_functions[]; +extern const OSSL_DISPATCH ossl_ecdsa_signature_functions[]; extern const OSSL_DISPATCH ossl_mac_legacy_hmac_signature_functions[]; extern const OSSL_DISPATCH ossl_mac_legacy_siphash_signature_functions[]; extern const OSSL_DISPATCH ossl_mac_legacy_poly1305_signature_functions[]; extern const OSSL_DISPATCH ossl_mac_legacy_cmac_signature_functions[]; -extern const OSSL_DISPATCH sm2_signature_functions[]; +extern const OSSL_DISPATCH ossl_sm2_signature_functions[]; /* Asym Cipher */ extern const OSSL_DISPATCH ossl_rsa_asym_cipher_functions[]; #ifndef OPENSSL_NO_SM2 -extern const OSSL_DISPATCH sm2_asym_cipher_functions[]; +extern const OSSL_DISPATCH ossl_sm2_asym_cipher_functions[]; #endif /* Asym Key encapsulation */ diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index fc49aad1b98..d7ed92bd68f 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -1311,7 +1311,7 @@ const OSSL_DISPATCH ossl_ec_keymgmt_functions[] = { #ifndef FIPS_MODULE # ifndef OPENSSL_NO_SM2 -const OSSL_DISPATCH sm2_keymgmt_functions[] = { +const OSSL_DISPATCH ossl_sm2_keymgmt_functions[] = { { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))ec_newdata }, { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))ec_gen_init }, { OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE, diff --git a/providers/implementations/signature/ecdsa.c b/providers/implementations/signature/ecdsa.c index 28e8b46ac7d..e8e8e8d143f 100644 --- a/providers/implementations/signature/ecdsa.c +++ b/providers/implementations/signature/ecdsa.c @@ -534,7 +534,7 @@ static const OSSL_PARAM *ecdsa_settable_ctx_md_params(void *vctx) return EVP_MD_settable_ctx_params(ctx->md); } -const OSSL_DISPATCH ecossl_dsa_signature_functions[] = { +const OSSL_DISPATCH ossl_ecdsa_signature_functions[] = { { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))ecdsa_newctx }, { OSSL_FUNC_SIGNATURE_SIGN_INIT, (void (*)(void))ecdsa_sign_init }, { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))ecdsa_sign }, diff --git a/providers/implementations/signature/sm2sig.c b/providers/implementations/signature/sm2sig.c index 6bd27d9d381..45fd70ef401 100644 --- a/providers/implementations/signature/sm2sig.c +++ b/providers/implementations/signature/sm2sig.c @@ -496,7 +496,7 @@ static const OSSL_PARAM *sm2sig_settable_ctx_md_params(void *vpsm2ctx) return EVP_MD_settable_ctx_params(psm2ctx->md); } -const OSSL_DISPATCH sm2_signature_functions[] = { +const OSSL_DISPATCH ossl_sm2_signature_functions[] = { { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))sm2sig_newctx }, { OSSL_FUNC_SIGNATURE_SIGN_INIT, (void (*)(void))sm2sig_signature_init }, { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))sm2sig_sign },