diff options
Diffstat (limited to 'providers/legacyprov.c')
| -rw-r--r-- | providers/legacyprov.c | 83 |
1 files changed, 42 insertions, 41 deletions
diff --git a/providers/legacyprov.c b/providers/legacyprov.c index e3690e0559..ddb2158d5a 100644 --- a/providers/legacyprov.c +++ b/providers/legacyprov.c @@ -15,6 +15,7 @@ #include <openssl/params.h> #include "prov/provider_ctx.h" #include "prov/implementations.h" +#include "prov/names.h" #include "prov/providercommon.h" /* @@ -67,77 +68,77 @@ static int legacy_get_params(void *provctx, OSSL_PARAM params[]) static const OSSL_ALGORITHM legacy_digests[] = { #ifndef OPENSSL_NO_MD2 - ALG("MD2", ossl_md2_functions), + ALG(PROV_NAMES_MD2, ossl_md2_functions), #endif #ifndef OPENSSL_NO_MD4 - ALG("MD4", ossl_md4_functions), + ALG(PROV_NAMES_MD4, ossl_md4_functions), #endif #ifndef OPENSSL_NO_MDC2 - ALG("MDC2", ossl_mdc2_functions), + ALG(PROV_NAMES_MDC2, ossl_mdc2_functions), #endif /* OPENSSL_NO_MDC2 */ #ifndef OPENSSL_NO_WHIRLPOOL - ALG("WHIRLPOOL", ossl_wp_functions), + ALG(PROV_NAMES_WHIRLPOOL, ossl_wp_functions), #endif /* OPENSSL_NO_WHIRLPOOL */ #ifndef OPENSSL_NO_RMD160 - ALG("RIPEMD-160:RIPEMD160:RIPEMD:RMD160", ossl_ripemd160_functions), + ALG(PROV_NAMES_RIPEMD_160, ossl_ripemd160_functions), #endif /* OPENSSL_NO_RMD160 */ { NULL, NULL, NULL } }; static const OSSL_ALGORITHM legacy_ciphers[] = { #ifndef OPENSSL_NO_CAST - ALG("CAST5-ECB", ossl_cast5128ecb_functions), - ALG("CAST5-CBC:CAST-CBC:CAST", ossl_cast5128cbc_functions), - ALG("CAST5-OFB", ossl_cast5128ofb64_functions), - ALG("CAST5-CFB", ossl_cast5128cfb64_functions), + ALG(PROV_NAMES_CAST5_ECB, ossl_cast5128ecb_functions), + ALG(PROV_NAMES_CAST5_CBC, ossl_cast5128cbc_functions), + ALG(PROV_NAMES_CAST5_OFB, ossl_cast5128ofb64_functions), + ALG(PROV_NAMES_CAST5_CFB, ossl_cast5128cfb64_functions), #endif /* OPENSSL_NO_CAST */ #ifndef OPENSSL_NO_BF - ALG("BF-ECB", ossl_blowfish128ecb_functions), - ALG("BF-CBC:BF:BLOWFISH", ossl_blowfish128cbc_functions), - ALG("BF-OFB", ossl_blowfish64ofb64_functions), - ALG("BF-CFB", ossl_blowfish64cfb64_functions), + ALG(PROV_NAMES_BF_ECB, ossl_blowfish128ecb_functions), + ALG(PROV_NAMES_BF_CBC, ossl_blowfish128cbc_functions), + ALG(PROV_NAMES_BF_OFB, ossl_blowfish64ofb64_functions), + ALG(PROV_NAMES_BF_CFB, ossl_blowfish64cfb64_functions), #endif /* OPENSSL_NO_BF */ #ifndef OPENSSL_NO_IDEA - ALG("IDEA-ECB", ossl_idea128ecb_functions), - ALG("IDEA-CBC:IDEA", ossl_idea128cbc_functions), - ALG("IDEA-OFB:IDEA-OFB64", ossl_idea128ofb64_functions), - ALG("IDEA-CFB:IDEA-CFB64", ossl_idea128cfb64_functions), + ALG(PROV_NAMES_IDEA_ECB, ossl_idea128ecb_functions), + ALG(PROV_NAMES_IDEA_CBC, ossl_idea128cbc_functions), + ALG(PROV_NAMES_IDEA_OFB, ossl_idea128ofb64_functions), + ALG(PROV_NAMES_IDEA_CFB, ossl_idea128cfb64_functions), #endif /* OPENSSL_NO_IDEA */ #ifndef OPENSSL_NO_SEED - ALG("SEED-ECB", ossl_seed128ecb_functions), - ALG("SEED-CBC:SEED", ossl_seed128cbc_functions), - ALG("SEED-OFB:SEED-OFB128", ossl_seed128ofb128_functions), - ALG("SEED-CFB:SEED-CFB128", ossl_seed128cfb128_functions), + ALG(PROV_NAMES_SEED_ECB, ossl_seed128ecb_functions), + ALG(PROV_NAMES_SEED_CBC, ossl_seed128cbc_functions), + ALG(PROV_NAMES_SEED_OFB, ossl_seed128ofb128_functions), + ALG(PROV_NAMES_SEED_CFB, ossl_seed128cfb128_functions), #endif /* OPENSSL_NO_SEED */ #ifndef OPENSSL_NO_RC2 - ALG("RC2-ECB", ossl_rc2128ecb_functions), - ALG("RC2-CBC:RC2:RC2-128", ossl_rc2128cbc_functions), - ALG("RC2-40-CBC:RC2-40", ossl_rc240cbc_functions), - ALG("RC2-64-CBC:RC2-64", ossl_rc264cbc_functions), - ALG("RC2-CFB", ossl_rc2128cfb128_functions), - ALG("RC2-OFB", ossl_rc2128ofb128_functions), + ALG(PROV_NAMES_RC2_ECB, ossl_rc2128ecb_functions), + ALG(PROV_NAMES_RC2_CBC, ossl_rc2128cbc_functions), + ALG(PROV_NAMES_RC2_40_CBC, ossl_rc240cbc_functions), + ALG(PROV_NAMES_RC2_64_CBC, ossl_rc264cbc_functions), + ALG(PROV_NAMES_RC2_CFB, ossl_rc2128cfb128_functions), + ALG(PROV_NAMES_RC2_OFB, ossl_rc2128ofb128_functions), #endif /* OPENSSL_NO_RC2 */ #ifndef OPENSSL_NO_RC4 - ALG("RC4", ossl_rc4128_functions), - ALG("RC4-40", ossl_rc440_functions), + ALG(PROV_NAMES_RC4, ossl_rc4128_functions), + ALG(PROV_NAMES_RC4_40, ossl_rc440_functions), # ifndef OPENSSL_NO_MD5 - ALG("RC4-HMAC-MD5", ossl_rc4_hmac_ossl_md5_functions), + ALG(PROV_NAMES_RC4_HMAC_MD5, ossl_rc4_hmac_ossl_md5_functions), # endif /* OPENSSL_NO_MD5 */ #endif /* OPENSSL_NO_RC4 */ #ifndef OPENSSL_NO_RC5 - ALG("RC5-ECB", ossl_rc5128ecb_functions), - ALG("RC5-CBC:RC5", ossl_rc5128cbc_functions), - ALG("RC5-OFB", ossl_rc5128ofb64_functions), - ALG("RC5-CFB", ossl_rc5128cfb64_functions), + ALG(PROV_NAMES_RC5_ECB, ossl_rc5128ecb_functions), + ALG(PROV_NAMES_RC5_CBC, ossl_rc5128cbc_functions), + ALG(PROV_NAMES_RC5_OFB, ossl_rc5128ofb64_functions), + ALG(PROV_NAMES_RC5_CFB, ossl_rc5128cfb64_functions), #endif /* OPENSSL_NO_RC5 */ #ifndef OPENSSL_NO_DES - ALG("DESX-CBC:DESX", ossl_tdes_desx_cbc_functions), - ALG("DES-ECB", ossl_des_ecb_functions), - ALG("DES-CBC:DES", ossl_des_cbc_functions), - ALG("DES-OFB", ossl_des_ofb64_functions), - ALG("DES-CFB", ossl_des_cfb64_functions), - ALG("DES-CFB1", ossl_des_cfb1_functions), - ALG("DES-CFB8", ossl_des_cfb8_functions), + ALG(PROV_NAMES_DESX_CBC, ossl_tdes_desx_cbc_functions), + ALG(PROV_NAMES_DES_ECB, ossl_des_ecb_functions), + ALG(PROV_NAMES_DES_CBC, ossl_des_cbc_functions), + ALG(PROV_NAMES_DES_OFB, ossl_des_ofb64_functions), + ALG(PROV_NAMES_DES_CFB, ossl_des_cfb64_functions), + ALG(PROV_NAMES_DES_CFB1, ossl_des_cfb1_functions), + ALG(PROV_NAMES_DES_CFB8, ossl_des_cfb8_functions), #endif /* OPENSSL_NO_DES */ { NULL, NULL, NULL } }; |