mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some odd names in our provider source code

Browse Source 
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 <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14028)
This commit is contained in:
Richard Levitte 2021-01-28 08:01:52 +01:00
parent b8a1272d57
commit 58f422f6f4
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
providers/defltprov.c
View File

@ -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 }
};

4
providers/fips/fipsprov.c
View File

@ -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 },

2
providers/implementations/asymciphers/sm2_enc.c
View File

@ -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 },

2
providers/implementations/exchange/ecdh_exch.c
View File

@ -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 },

10
providers/implementations/include/prov/implementations.h
View File

@ -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 */

2
providers/implementations/keymgmt/ec_kmgmt.c
View File

@ -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,

2
providers/implementations/signature/ecdsa.c
View File

@ -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 },

2
providers/implementations/signature/sm2sig.c
View File

@ -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 },