X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=providers%2Fdefltprov.c;h=e5d7fe4877d1daf4611b4f240112b1c1cec208c6;hp=0f66aa2b7133bf14cff981179722026f541329e3;hb=HEAD;hpb=f552d900459cbacd82433b688b237cd6870663cd diff --git a/providers/defltprov.c b/providers/defltprov.c index 0f66aa2b71..f02e04835d 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -1,5 +1,5 @@ /* - * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -11,36 +11,48 @@ #include #include #include -#include +#include #include #include #include "prov/bio.h" +#include "prov/provider_ctx.h" #include "prov/providercommon.h" #include "prov/implementations.h" +#include "prov/names.h" #include "prov/provider_util.h" +#include "prov/seeding.h" #include "internal/nelem.h" +/* + * Forward declarations to ensure that interface functions are correctly + * defined. + */ +static OSSL_FUNC_provider_gettable_params_fn deflt_gettable_params; +static OSSL_FUNC_provider_get_params_fn deflt_get_params; +static OSSL_FUNC_provider_query_operation_fn deflt_query; + #define ALGC(NAMES, FUNC, CHECK) { { NAMES, "provider=default", FUNC }, CHECK } #define ALG(NAMES, FUNC) ALGC(NAMES, FUNC, NULL) /* Functions provided by the core */ -static OSSL_core_gettable_params_fn *c_gettable_params = NULL; -static OSSL_core_get_params_fn *c_get_params = NULL; +static OSSL_FUNC_core_gettable_params_fn *c_gettable_params = NULL; +static OSSL_FUNC_core_get_params_fn *c_get_params = NULL; /* Parameters we provide to the core */ static const OSSL_PARAM deflt_param_types[] = { OSSL_PARAM_DEFN(OSSL_PROV_PARAM_NAME, OSSL_PARAM_UTF8_PTR, NULL, 0), OSSL_PARAM_DEFN(OSSL_PROV_PARAM_VERSION, OSSL_PARAM_UTF8_PTR, NULL, 0), OSSL_PARAM_DEFN(OSSL_PROV_PARAM_BUILDINFO, OSSL_PARAM_UTF8_PTR, NULL, 0), + OSSL_PARAM_DEFN(OSSL_PROV_PARAM_STATUS, OSSL_PARAM_INTEGER, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *deflt_gettable_params(const OSSL_PROVIDER *prov) +static const OSSL_PARAM *deflt_gettable_params(void *provctx) { return deflt_param_types; } -static int deflt_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]) +static int deflt_get_params(void *provctx, OSSL_PARAM params[]) { OSSL_PARAM *p; @@ -53,7 +65,9 @@ static int deflt_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]) p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_BUILDINFO); if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, OPENSSL_FULL_VERSION_STR)) return 0; - + p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_STATUS); + if (p != NULL && !OSSL_PARAM_set_int(p, ossl_prov_is_running())) + return 0; return 1; } @@ -86,32 +100,38 @@ static int deflt_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]) */ static const OSSL_ALGORITHM deflt_digests[] = { /* Our primary name:NIST name[:our older names] */ - { "SHA1:SHA-1", "provider=default", sha1_functions }, - { "SHA2-224:SHA-224:SHA224", "provider=default", sha224_functions }, - { "SHA2-256:SHA-256:SHA256", "provider=default", sha256_functions }, - { "SHA2-384:SHA-384:SHA384", "provider=default", sha384_functions }, - { "SHA2-512:SHA-512:SHA512", "provider=default", sha512_functions }, - { "SHA2-512/224:SHA-512/224:SHA512-224", "provider=default", - sha512_224_functions }, - { "SHA2-512/256:SHA-512/256:SHA512-256", "provider=default", - sha512_256_functions }, + { PROV_NAMES_SHA1, "provider=default", ossl_sha1_functions }, + { PROV_NAMES_SHA2_224, "provider=default", ossl_sha224_functions }, + { PROV_NAMES_SHA2_256, "provider=default", ossl_sha256_functions }, + { PROV_NAMES_SHA2_256_192, "provider=default", ossl_sha256_192_functions }, + { PROV_NAMES_SHA2_384, "provider=default", ossl_sha384_functions }, + { PROV_NAMES_SHA2_512, "provider=default", ossl_sha512_functions }, + { PROV_NAMES_SHA2_512_224, "provider=default", ossl_sha512_224_functions }, + { PROV_NAMES_SHA2_512_256, "provider=default", ossl_sha512_256_functions }, /* We agree with NIST here, so one name only */ - { "SHA3-224", "provider=default", sha3_224_functions }, - { "SHA3-256", "provider=default", sha3_256_functions }, - { "SHA3-384", "provider=default", sha3_384_functions }, - { "SHA3-512", "provider=default", sha3_512_functions }, + { PROV_NAMES_SHA3_224, "provider=default", ossl_sha3_224_functions }, + { PROV_NAMES_SHA3_256, "provider=default", ossl_sha3_256_functions }, + { PROV_NAMES_SHA3_384, "provider=default", ossl_sha3_384_functions }, + { PROV_NAMES_SHA3_512, "provider=default", ossl_sha3_512_functions }, + + { PROV_NAMES_KECCAK_224, "provider=default", ossl_keccak_224_functions }, + { PROV_NAMES_KECCAK_256, "provider=default", ossl_keccak_256_functions }, + { PROV_NAMES_KECCAK_384, "provider=default", ossl_keccak_384_functions }, + { PROV_NAMES_KECCAK_512, "provider=default", ossl_keccak_512_functions }, /* * KECCAK-KMAC-128 and KECCAK-KMAC-256 as hashes are mostly useful for * the KMAC-128 and KMAC-256. */ - { "KECCAK-KMAC-128:KECCAK-KMAC128", "provider=default", keccak_kmac_128_functions }, - { "KECCAK-KMAC-256:KECCAK-KMAC256", "provider=default", keccak_kmac_256_functions }, + { PROV_NAMES_KECCAK_KMAC_128, "provider=default", + ossl_keccak_kmac_128_functions }, + { PROV_NAMES_KECCAK_KMAC_256, "provider=default", + ossl_keccak_kmac_256_functions }, /* Our primary name:NIST name */ - { "SHAKE-128:SHAKE128", "provider=default", shake_128_functions }, - { "SHAKE-256:SHAKE256", "provider=default", shake_256_functions }, + { PROV_NAMES_SHAKE_128, "provider=default", ossl_shake_128_functions }, + { PROV_NAMES_SHAKE_256, "provider=default", ossl_shake_256_functions }, #ifndef OPENSSL_NO_BLAKE2 /* @@ -121,208 +141,176 @@ static const OSSL_ALGORITHM deflt_digests[] = { * If we assume that "2b" and "2s" are versions, that pattern * fits with ours. We also add our historical names. */ - { "BLAKE2S-256:BLAKE2s256", "provider=default", blake2s256_functions }, - { "BLAKE2B-512:BLAKE2b512", "provider=default", blake2b512_functions }, + { PROV_NAMES_BLAKE2S_256, "provider=default", ossl_blake2s256_functions }, + { PROV_NAMES_BLAKE2B_512, "provider=default", ossl_blake2b512_functions }, #endif /* OPENSSL_NO_BLAKE2 */ #ifndef OPENSSL_NO_SM3 - { "SM3", "provider=default", sm3_functions }, + { PROV_NAMES_SM3, "provider=default", ossl_sm3_functions }, #endif /* OPENSSL_NO_SM3 */ #ifndef OPENSSL_NO_MD5 - { "MD5", "provider=default", md5_functions }, - { "MD5-SHA1", "provider=default", md5_sha1_functions }, + { PROV_NAMES_MD5, "provider=default", ossl_md5_functions }, + { PROV_NAMES_MD5_SHA1, "provider=default", ossl_md5_sha1_functions }, #endif /* OPENSSL_NO_MD5 */ +#ifndef OPENSSL_NO_RMD160 + { PROV_NAMES_RIPEMD_160, "provider=default", ossl_ripemd160_functions }, +#endif /* OPENSSL_NO_RMD160 */ + + { PROV_NAMES_NULL, "provider=default", ossl_nullmd_functions }, { NULL, NULL, NULL } }; static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = { - ALG("NULL", null_functions), - ALG("AES-256-ECB", aes256ecb_functions), - ALG("AES-192-ECB", aes192ecb_functions), - ALG("AES-128-ECB", aes128ecb_functions), - ALG("AES-256-CBC", aes256cbc_functions), - ALG("AES-192-CBC", aes192cbc_functions), - ALG("AES-128-CBC", aes128cbc_functions), - ALG("AES-256-OFB", aes256ofb_functions), - ALG("AES-192-OFB", aes192ofb_functions), - ALG("AES-128-OFB", aes128ofb_functions), - ALG("AES-256-CFB", aes256cfb_functions), - ALG("AES-192-CFB", aes192cfb_functions), - ALG("AES-128-CFB", aes128cfb_functions), - ALG("AES-256-CFB1", aes256cfb1_functions), - ALG("AES-192-CFB1", aes192cfb1_functions), - ALG("AES-128-CFB1", aes128cfb1_functions), - ALG("AES-256-CFB8", aes256cfb8_functions), - ALG("AES-192-CFB8", aes192cfb8_functions), - ALG("AES-128-CFB8", aes128cfb8_functions), - ALG("AES-256-CTR", aes256ctr_functions), - ALG("AES-192-CTR", aes192ctr_functions), - ALG("AES-128-CTR", aes128ctr_functions), - ALG("AES-256-XTS", aes256xts_functions), - ALG("AES-128-XTS", aes128xts_functions), + ALG(PROV_NAMES_NULL, ossl_null_functions), + ALG(PROV_NAMES_AES_256_ECB, ossl_aes256ecb_functions), + ALG(PROV_NAMES_AES_192_ECB, ossl_aes192ecb_functions), + ALG(PROV_NAMES_AES_128_ECB, ossl_aes128ecb_functions), + ALG(PROV_NAMES_AES_256_CBC, ossl_aes256cbc_functions), + ALG(PROV_NAMES_AES_192_CBC, ossl_aes192cbc_functions), + ALG(PROV_NAMES_AES_128_CBC, ossl_aes128cbc_functions), + ALG(PROV_NAMES_AES_128_CBC_CTS, ossl_aes128cbc_cts_functions), + ALG(PROV_NAMES_AES_192_CBC_CTS, ossl_aes192cbc_cts_functions), + ALG(PROV_NAMES_AES_256_CBC_CTS, ossl_aes256cbc_cts_functions), + ALG(PROV_NAMES_AES_256_OFB, ossl_aes256ofb_functions), + ALG(PROV_NAMES_AES_192_OFB, ossl_aes192ofb_functions), + ALG(PROV_NAMES_AES_128_OFB, ossl_aes128ofb_functions), + ALG(PROV_NAMES_AES_256_CFB, ossl_aes256cfb_functions), + ALG(PROV_NAMES_AES_192_CFB, ossl_aes192cfb_functions), + ALG(PROV_NAMES_AES_128_CFB, ossl_aes128cfb_functions), + ALG(PROV_NAMES_AES_256_CFB1, ossl_aes256cfb1_functions), + ALG(PROV_NAMES_AES_192_CFB1, ossl_aes192cfb1_functions), + ALG(PROV_NAMES_AES_128_CFB1, ossl_aes128cfb1_functions), + ALG(PROV_NAMES_AES_256_CFB8, ossl_aes256cfb8_functions), + ALG(PROV_NAMES_AES_192_CFB8, ossl_aes192cfb8_functions), + ALG(PROV_NAMES_AES_128_CFB8, ossl_aes128cfb8_functions), + ALG(PROV_NAMES_AES_256_CTR, ossl_aes256ctr_functions), + ALG(PROV_NAMES_AES_192_CTR, ossl_aes192ctr_functions), + ALG(PROV_NAMES_AES_128_CTR, ossl_aes128ctr_functions), + ALG(PROV_NAMES_AES_256_XTS, ossl_aes256xts_functions), + ALG(PROV_NAMES_AES_128_XTS, ossl_aes128xts_functions), #ifndef OPENSSL_NO_OCB - ALG("AES-256-OCB", aes256ocb_functions), - ALG("AES-192-OCB", aes192ocb_functions), - ALG("AES-128-OCB", aes128ocb_functions), + ALG(PROV_NAMES_AES_256_OCB, ossl_aes256ocb_functions), + ALG(PROV_NAMES_AES_192_OCB, ossl_aes192ocb_functions), + ALG(PROV_NAMES_AES_128_OCB, ossl_aes128ocb_functions), #endif /* OPENSSL_NO_OCB */ #ifndef OPENSSL_NO_SIV - ALG("AES-128-SIV", aes128siv_functions), - ALG("AES-192-SIV", aes192siv_functions), - ALG("AES-256-SIV", aes256siv_functions), + ALG(PROV_NAMES_AES_128_SIV, ossl_aes128siv_functions), + ALG(PROV_NAMES_AES_192_SIV, ossl_aes192siv_functions), + ALG(PROV_NAMES_AES_256_SIV, ossl_aes256siv_functions), + ALG(PROV_NAMES_AES_128_GCM_SIV, ossl_aes128gcm_siv_functions), + ALG(PROV_NAMES_AES_192_GCM_SIV, ossl_aes192gcm_siv_functions), + ALG(PROV_NAMES_AES_256_GCM_SIV, ossl_aes256gcm_siv_functions), #endif /* OPENSSL_NO_SIV */ - ALG("AES-256-GCM:id-aes256-GCM", aes256gcm_functions), - ALG("AES-192-GCM:id-aes192-GCM", aes192gcm_functions), - ALG("AES-128-GCM:id-aes128-GCM", aes128gcm_functions), - ALG("AES-256-CCM:id-aes256-CCM", aes256ccm_functions), - ALG("AES-192-CCM:id-aes192-CCM", aes192ccm_functions), - ALG("AES-128-CCM:id-aes128-CCM", aes128ccm_functions), - ALG("AES-256-WRAP:id-aes256-wrap:AES256-WRAP", aes256wrap_functions), - ALG("AES-192-WRAP:id-aes192-wrap:AES192-WRAP", aes192wrap_functions), - ALG("AES-128-WRAP:id-aes128-wrap:AES128-WRAP", aes128wrap_functions), - ALG("AES-256-WRAP-PAD:id-aes256-wrap-pad:AES256-WRAP-PAD", - aes256wrappad_functions), - ALG("AES-192-WRAP-PAD:id-aes192-wrap-pad:AES192-WRAP-PAD", - aes192wrappad_functions), - ALG("AES-128-WRAP-PAD:id-aes128-wrap-pad:AES128-WRAP-PAD", - aes128wrappad_functions), - ALGC("AES-128-CBC-HMAC-SHA1", aes128cbc_hmac_sha1_functions, - cipher_capable_aes_cbc_hmac_sha1), - ALGC("AES-256-CBC-HMAC-SHA1", aes256cbc_hmac_sha1_functions, - cipher_capable_aes_cbc_hmac_sha1), - ALGC("AES-128-CBC-HMAC-SHA256", aes128cbc_hmac_sha256_functions, - cipher_capable_aes_cbc_hmac_sha256), - ALGC("AES-256-CBC-HMAC-SHA256", aes256cbc_hmac_sha256_functions, - cipher_capable_aes_cbc_hmac_sha256), + ALG(PROV_NAMES_AES_256_GCM, ossl_aes256gcm_functions), + ALG(PROV_NAMES_AES_192_GCM, ossl_aes192gcm_functions), + ALG(PROV_NAMES_AES_128_GCM, ossl_aes128gcm_functions), + ALG(PROV_NAMES_AES_256_CCM, ossl_aes256ccm_functions), + ALG(PROV_NAMES_AES_192_CCM, ossl_aes192ccm_functions), + ALG(PROV_NAMES_AES_128_CCM, ossl_aes128ccm_functions), + ALG(PROV_NAMES_AES_256_WRAP, ossl_aes256wrap_functions), + ALG(PROV_NAMES_AES_192_WRAP, ossl_aes192wrap_functions), + ALG(PROV_NAMES_AES_128_WRAP, ossl_aes128wrap_functions), + ALG(PROV_NAMES_AES_256_WRAP_PAD, ossl_aes256wrappad_functions), + ALG(PROV_NAMES_AES_192_WRAP_PAD, ossl_aes192wrappad_functions), + ALG(PROV_NAMES_AES_128_WRAP_PAD, ossl_aes128wrappad_functions), + ALG(PROV_NAMES_AES_256_WRAP_INV, ossl_aes256wrapinv_functions), + ALG(PROV_NAMES_AES_192_WRAP_INV, ossl_aes192wrapinv_functions), + ALG(PROV_NAMES_AES_128_WRAP_INV, ossl_aes128wrapinv_functions), + ALG(PROV_NAMES_AES_256_WRAP_PAD_INV, ossl_aes256wrappadinv_functions), + ALG(PROV_NAMES_AES_192_WRAP_PAD_INV, ossl_aes192wrappadinv_functions), + ALG(PROV_NAMES_AES_128_WRAP_PAD_INV, ossl_aes128wrappadinv_functions), + ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA1, ossl_aes128cbc_hmac_sha1_functions, + ossl_cipher_capable_aes_cbc_hmac_sha1), + ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA1, ossl_aes256cbc_hmac_sha1_functions, + ossl_cipher_capable_aes_cbc_hmac_sha1), + ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA256, ossl_aes128cbc_hmac_sha256_functions, + ossl_cipher_capable_aes_cbc_hmac_sha256), + ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA256, ossl_aes256cbc_hmac_sha256_functions, + ossl_cipher_capable_aes_cbc_hmac_sha256), #ifndef OPENSSL_NO_ARIA - ALG("ARIA-256-GCM", aria256gcm_functions), - ALG("ARIA-192-GCM", aria192gcm_functions), - ALG("ARIA-128-GCM", aria128gcm_functions), - ALG("ARIA-256-CCM", aria256ccm_functions), - ALG("ARIA-192-CCM", aria192ccm_functions), - ALG("ARIA-128-CCM", aria128ccm_functions), - ALG("ARIA-256-ECB", aria256ecb_functions), - ALG("ARIA-192-ECB", aria192ecb_functions), - ALG("ARIA-128-ECB", aria128ecb_functions), - ALG("ARIA-256-CBC:ARIA256", aria256cbc_functions), - ALG("ARIA-192-CBC:ARIA192", aria192cbc_functions), - ALG("ARIA-128-CBC:ARIA128", aria128cbc_functions), - ALG("ARIA-256-OFB", aria256ofb_functions), - ALG("ARIA-192-OFB", aria192ofb_functions), - ALG("ARIA-128-OFB", aria128ofb_functions), - ALG("ARIA-256-CFB", aria256cfb_functions), - ALG("ARIA-192-CFB", aria192cfb_functions), - ALG("ARIA-128-CFB", aria128cfb_functions), - ALG("ARIA-256-CFB1", aria256cfb1_functions), - ALG("ARIA-192-CFB1", aria192cfb1_functions), - ALG("ARIA-128-CFB1", aria128cfb1_functions), - ALG("ARIA-256-CFB8", aria256cfb8_functions), - ALG("ARIA-192-CFB8", aria192cfb8_functions), - ALG("ARIA-128-CFB8", aria128cfb8_functions), - ALG("ARIA-256-CTR", aria256ctr_functions), - ALG("ARIA-192-CTR", aria192ctr_functions), - ALG("ARIA-128-CTR", aria128ctr_functions), + ALG(PROV_NAMES_ARIA_256_GCM, ossl_aria256gcm_functions), + ALG(PROV_NAMES_ARIA_192_GCM, ossl_aria192gcm_functions), + ALG(PROV_NAMES_ARIA_128_GCM, ossl_aria128gcm_functions), + ALG(PROV_NAMES_ARIA_256_CCM, ossl_aria256ccm_functions), + ALG(PROV_NAMES_ARIA_192_CCM, ossl_aria192ccm_functions), + ALG(PROV_NAMES_ARIA_128_CCM, ossl_aria128ccm_functions), + ALG(PROV_NAMES_ARIA_256_ECB, ossl_aria256ecb_functions), + ALG(PROV_NAMES_ARIA_192_ECB, ossl_aria192ecb_functions), + ALG(PROV_NAMES_ARIA_128_ECB, ossl_aria128ecb_functions), + ALG(PROV_NAMES_ARIA_256_CBC, ossl_aria256cbc_functions), + ALG(PROV_NAMES_ARIA_192_CBC, ossl_aria192cbc_functions), + ALG(PROV_NAMES_ARIA_128_CBC, ossl_aria128cbc_functions), + ALG(PROV_NAMES_ARIA_256_OFB, ossl_aria256ofb_functions), + ALG(PROV_NAMES_ARIA_192_OFB, ossl_aria192ofb_functions), + ALG(PROV_NAMES_ARIA_128_OFB, ossl_aria128ofb_functions), + ALG(PROV_NAMES_ARIA_256_CFB, ossl_aria256cfb_functions), + ALG(PROV_NAMES_ARIA_192_CFB, ossl_aria192cfb_functions), + ALG(PROV_NAMES_ARIA_128_CFB, ossl_aria128cfb_functions), + ALG(PROV_NAMES_ARIA_256_CFB1, ossl_aria256cfb1_functions), + ALG(PROV_NAMES_ARIA_192_CFB1, ossl_aria192cfb1_functions), + ALG(PROV_NAMES_ARIA_128_CFB1, ossl_aria128cfb1_functions), + ALG(PROV_NAMES_ARIA_256_CFB8, ossl_aria256cfb8_functions), + ALG(PROV_NAMES_ARIA_192_CFB8, ossl_aria192cfb8_functions), + ALG(PROV_NAMES_ARIA_128_CFB8, ossl_aria128cfb8_functions), + ALG(PROV_NAMES_ARIA_256_CTR, ossl_aria256ctr_functions), + ALG(PROV_NAMES_ARIA_192_CTR, ossl_aria192ctr_functions), + ALG(PROV_NAMES_ARIA_128_CTR, ossl_aria128ctr_functions), #endif /* OPENSSL_NO_ARIA */ #ifndef OPENSSL_NO_CAMELLIA - ALG("CAMELLIA-256-ECB", camellia256ecb_functions), - ALG("CAMELLIA-192-ECB", camellia192ecb_functions), - ALG("CAMELLIA-128-ECB", camellia128ecb_functions), - ALG("CAMELLIA-256-CBC:CAMELLIA256", camellia256cbc_functions), - ALG("CAMELLIA-192-CBC:CAMELLIA192", camellia192cbc_functions), - ALG("CAMELLIA-128-CBC:CAMELLIA128", camellia128cbc_functions), - ALG("CAMELLIA-256-OFB", camellia256ofb_functions), - ALG("CAMELLIA-192-OFB", camellia192ofb_functions), - ALG("CAMELLIA-128-OFB", camellia128ofb_functions), - ALG("CAMELLIA-256-CFB", camellia256cfb_functions), - ALG("CAMELLIA-192-CFB", camellia192cfb_functions), - ALG("CAMELLIA-128-CFB", camellia128cfb_functions), - ALG("CAMELLIA-256-CFB1", camellia256cfb1_functions), - ALG("CAMELLIA-192-CFB1", camellia192cfb1_functions), - ALG("CAMELLIA-128-CFB1", camellia128cfb1_functions), - ALG("CAMELLIA-256-CFB8", camellia256cfb8_functions), - ALG("CAMELLIA-192-CFB8", camellia192cfb8_functions), - ALG("CAMELLIA-128-CFB8", camellia128cfb8_functions), - ALG("CAMELLIA-256-CTR", camellia256ctr_functions), - ALG("CAMELLIA-192-CTR", camellia192ctr_functions), - ALG("CAMELLIA-128-CTR", camellia128ctr_functions), + ALG(PROV_NAMES_CAMELLIA_256_ECB, ossl_camellia256ecb_functions), + ALG(PROV_NAMES_CAMELLIA_192_ECB, ossl_camellia192ecb_functions), + ALG(PROV_NAMES_CAMELLIA_128_ECB, ossl_camellia128ecb_functions), + ALG(PROV_NAMES_CAMELLIA_256_CBC, ossl_camellia256cbc_functions), + ALG(PROV_NAMES_CAMELLIA_192_CBC, ossl_camellia192cbc_functions), + ALG(PROV_NAMES_CAMELLIA_128_CBC, ossl_camellia128cbc_functions), + ALG(PROV_NAMES_CAMELLIA_128_CBC_CTS, ossl_camellia128cbc_cts_functions), + ALG(PROV_NAMES_CAMELLIA_192_CBC_CTS, ossl_camellia192cbc_cts_functions), + ALG(PROV_NAMES_CAMELLIA_256_CBC_CTS, ossl_camellia256cbc_cts_functions), + ALG(PROV_NAMES_CAMELLIA_256_OFB, ossl_camellia256ofb_functions), + ALG(PROV_NAMES_CAMELLIA_192_OFB, ossl_camellia192ofb_functions), + ALG(PROV_NAMES_CAMELLIA_128_OFB, ossl_camellia128ofb_functions), + ALG(PROV_NAMES_CAMELLIA_256_CFB, ossl_camellia256cfb_functions), + ALG(PROV_NAMES_CAMELLIA_192_CFB, ossl_camellia192cfb_functions), + ALG(PROV_NAMES_CAMELLIA_128_CFB, ossl_camellia128cfb_functions), + ALG(PROV_NAMES_CAMELLIA_256_CFB1, ossl_camellia256cfb1_functions), + ALG(PROV_NAMES_CAMELLIA_192_CFB1, ossl_camellia192cfb1_functions), + ALG(PROV_NAMES_CAMELLIA_128_CFB1, ossl_camellia128cfb1_functions), + ALG(PROV_NAMES_CAMELLIA_256_CFB8, ossl_camellia256cfb8_functions), + ALG(PROV_NAMES_CAMELLIA_192_CFB8, ossl_camellia192cfb8_functions), + ALG(PROV_NAMES_CAMELLIA_128_CFB8, ossl_camellia128cfb8_functions), + ALG(PROV_NAMES_CAMELLIA_256_CTR, ossl_camellia256ctr_functions), + ALG(PROV_NAMES_CAMELLIA_192_CTR, ossl_camellia192ctr_functions), + ALG(PROV_NAMES_CAMELLIA_128_CTR, ossl_camellia128ctr_functions), #endif /* OPENSSL_NO_CAMELLIA */ #ifndef OPENSSL_NO_DES - ALG("DES-EDE3-ECB:DES-EDE3", tdes_ede3_ecb_functions), - ALG("DES-EDE3-CBC:DES3", tdes_ede3_cbc_functions), - ALG("DES-EDE3-OFB", tdes_ede3_ofb_functions), - ALG("DES-EDE3-CFB", tdes_ede3_cfb_functions), - ALG("DES-EDE3-CFB8", tdes_ede3_cfb8_functions), - ALG("DES-EDE3-CFB1", tdes_ede3_cfb1_functions), - ALG("DES-EDE-ECB:DES-EDE", tdes_ede2_ecb_functions), - ALG("DES-EDE-CBC", tdes_ede2_cbc_functions), - ALG("DES-EDE-OFB", tdes_ede2_ofb_functions), - ALG("DES-EDE-CFB", tdes_ede2_cfb_functions), - ALG("DESX-CBC:DESX", tdes_desx_cbc_functions), - ALG("DES3-WRAP:id-smime-alg-CMS3DESwrap", tdes_wrap_cbc_functions), - ALG("DES-ECB", des_ecb_functions), - ALG("DES-CBC:DES", des_cbc_functions), - ALG("DES-OFB", des_ofb64_functions), - ALG("DES-CFB", des_cfb64_functions), - ALG("DES-CFB1", des_cfb1_functions), - ALG("DES-CFB8", des_cfb8_functions), + ALG(PROV_NAMES_DES_EDE3_ECB, ossl_tdes_ede3_ecb_functions), + ALG(PROV_NAMES_DES_EDE3_CBC, ossl_tdes_ede3_cbc_functions), + ALG(PROV_NAMES_DES_EDE3_OFB, ossl_tdes_ede3_ofb_functions), + ALG(PROV_NAMES_DES_EDE3_CFB, ossl_tdes_ede3_cfb_functions), + ALG(PROV_NAMES_DES_EDE3_CFB8, ossl_tdes_ede3_cfb8_functions), + ALG(PROV_NAMES_DES_EDE3_CFB1, ossl_tdes_ede3_cfb1_functions), + ALG(PROV_NAMES_DES3_WRAP, ossl_tdes_wrap_cbc_functions), + ALG(PROV_NAMES_DES_EDE_ECB, ossl_tdes_ede2_ecb_functions), + ALG(PROV_NAMES_DES_EDE_CBC, ossl_tdes_ede2_cbc_functions), + ALG(PROV_NAMES_DES_EDE_OFB, ossl_tdes_ede2_ofb_functions), + ALG(PROV_NAMES_DES_EDE_CFB, ossl_tdes_ede2_cfb_functions), #endif /* OPENSSL_NO_DES */ -#ifndef OPENSSL_NO_BF - ALG("BF-ECB", blowfish128ecb_functions), - ALG("BF-CBC:BF:BLOWFISH", blowfish128cbc_functions), - ALG("BF-OFB", blowfish64ofb64_functions), - ALG("BF-CFB", blowfish64cfb64_functions), -#endif /* OPENSSL_NO_BF */ -#ifndef OPENSSL_NO_IDEA - ALG("IDEA-ECB", idea128ecb_functions), - ALG("IDEA-CBC:IDEA", idea128cbc_functions), - ALG("IDEA-OFB:IDEA-OFB64", idea128ofb64_functions), - ALG("IDEA-CFB:IDEA-CFB64", idea128cfb64_functions), -#endif /* OPENSSL_NO_IDEA */ -#ifndef OPENSSL_NO_CAST - ALG("CAST5-ECB", cast5128ecb_functions), - ALG("CAST5-CBC:CAST-CBC:CAST", cast5128cbc_functions), - ALG("CAST5-OFB", cast564ofb64_functions), - ALG("CAST5-CFB", cast564cfb64_functions), -#endif /* OPENSSL_NO_CAST */ -#ifndef OPENSSL_NO_SEED - ALG("SEED-ECB", seed128ecb_functions), - ALG("SEED-CBC:SEED", seed128cbc_functions), - ALG("SEED-OFB:SEED-OFB128", seed128ofb128_functions), - ALG("SEED-CFB:SEED-CFB128", seed128cfb128_functions), -#endif /* OPENSSL_NO_SEED */ #ifndef OPENSSL_NO_SM4 - ALG("SM4-ECB", sm4128ecb_functions), - ALG("SM4-CBC:SM4", sm4128cbc_functions), - ALG("SM4-CTR", sm4128ctr_functions), - ALG("SM4-OFB:SM4-OFB128", sm4128ofb128_functions), - ALG("SM4-CFB:SM4-CFB128", sm4128cfb128_functions), + ALG(PROV_NAMES_SM4_GCM, ossl_sm4128gcm_functions), + ALG(PROV_NAMES_SM4_CCM, ossl_sm4128ccm_functions), + ALG(PROV_NAMES_SM4_ECB, ossl_sm4128ecb_functions), + ALG(PROV_NAMES_SM4_CBC, ossl_sm4128cbc_functions), + ALG(PROV_NAMES_SM4_CTR, ossl_sm4128ctr_functions), + ALG(PROV_NAMES_SM4_OFB, ossl_sm4128ofb128_functions), + ALG(PROV_NAMES_SM4_CFB, ossl_sm4128cfb128_functions), + ALG(PROV_NAMES_SM4_XTS, ossl_sm4128xts_functions), #endif /* OPENSSL_NO_SM4 */ -#ifndef OPENSSL_NO_RC4 - ALG("RC4", rc4128_functions), - ALG("RC4-40", rc440_functions), -# ifndef OPENSSL_NO_MD5 - ALG("RC4-HMAC-MD5", rc4_hmac_md5_functions), -# endif /* OPENSSL_NO_MD5 */ -#endif /* OPENSSL_NO_RC4 */ -#ifndef OPENSSL_NO_RC5 - ALG("RC5-ECB", rc5128ecb_functions), - ALG("RC5-CBC", rc5128cbc_functions), - ALG("RC5-OFB", rc5128ofb64_functions), - ALG("RC5-CFB", rc5128cfb64_functions), -#endif /* OPENSSL_NO_RC5 */ -#ifndef OPENSSL_NO_RC2 - ALG("RC2-ECB", rc2128ecb_functions), - ALG("RC2-CBC", rc2128cbc_functions), - ALG("RC2-40-CBC", rc240cbc_functions), - ALG("RC2-64-CBC", rc264cbc_functions), - ALG("RC2-CFB", rc2128cfb128_functions), - ALG("RC2-OFB", rc2128ofb128_functions), -#endif /* OPENSSL_NO_RC2 */ #ifndef OPENSSL_NO_CHACHA - ALG("ChaCha20", chacha20_functions), + ALG(PROV_NAMES_ChaCha20, ossl_chacha20_functions), # ifndef OPENSSL_NO_POLY1305 - ALG("ChaCha20-Poly1305", chacha20_poly1305_functions), + ALG(PROV_NAMES_ChaCha20_Poly1305, ossl_chacha20_ossl_poly1305_functions), # endif /* OPENSSL_NO_POLY1305 */ #endif /* OPENSSL_NO_CHACHA */ { { NULL, NULL, NULL }, NULL } @@ -331,196 +319,204 @@ static OSSL_ALGORITHM exported_ciphers[OSSL_NELEM(deflt_ciphers)]; static const OSSL_ALGORITHM deflt_macs[] = { #ifndef OPENSSL_NO_BLAKE2 - { "BLAKE2BMAC", "provider=default", blake2bmac_functions }, - { "BLAKE2SMAC", "provider=default", blake2smac_functions }, + { PROV_NAMES_BLAKE2BMAC, "provider=default", ossl_blake2bmac_functions }, + { PROV_NAMES_BLAKE2SMAC, "provider=default", ossl_blake2smac_functions }, #endif #ifndef OPENSSL_NO_CMAC - { "CMAC", "provider=default", cmac_functions }, + { PROV_NAMES_CMAC, "provider=default", ossl_cmac_functions }, #endif - { "GMAC", "provider=default", gmac_functions }, - { "HMAC", "provider=default", hmac_functions }, - { "KMAC-128:KMAC128", "provider=default", kmac128_functions }, - { "KMAC-256:KMAC256", "provider=default", kmac256_functions }, + { PROV_NAMES_GMAC, "provider=default", ossl_gmac_functions }, + { PROV_NAMES_HMAC, "provider=default", ossl_hmac_functions }, + { PROV_NAMES_KMAC_128, "provider=default", ossl_kmac128_functions }, + { PROV_NAMES_KMAC_256, "provider=default", ossl_kmac256_functions }, #ifndef OPENSSL_NO_SIPHASH - { "SIPHASH", "provider=default", siphash_functions }, + { PROV_NAMES_SIPHASH, "provider=default", ossl_siphash_functions }, #endif #ifndef OPENSSL_NO_POLY1305 - { "POLY1305", "provider=default", poly1305_functions }, + { PROV_NAMES_POLY1305, "provider=default", ossl_poly1305_functions }, #endif { NULL, NULL, NULL } }; static const OSSL_ALGORITHM deflt_kdfs[] = { - { "HKDF", "provider=default", kdf_hkdf_functions }, - { "SSKDF", "provider=default", kdf_sskdf_functions }, - { "PBKDF2", "provider=default", kdf_pbkdf2_functions }, - { "SSHKDF", "provider=default", kdf_sshkdf_functions }, - { "X963KDF", "provider=default", kdf_x963_kdf_functions }, - { "TLS1-PRF", "provider=default", kdf_tls1_prf_functions }, - { "KBKDF", "provider=default", kdf_kbkdf_functions }, -#ifndef OPENSSL_NO_CMS - { "X942KDF", "provider=default", kdf_x942_kdf_functions }, -#endif + { PROV_NAMES_HKDF, "provider=default", ossl_kdf_hkdf_functions }, + { PROV_NAMES_TLS1_3_KDF, "provider=default", + ossl_kdf_tls1_3_kdf_functions }, + { PROV_NAMES_SSKDF, "provider=default", ossl_kdf_sskdf_functions }, + { PROV_NAMES_PBKDF2, "provider=default", ossl_kdf_pbkdf2_functions }, + { PROV_NAMES_PKCS12KDF, "provider=default", ossl_kdf_pkcs12_functions }, + { PROV_NAMES_SSHKDF, "provider=default", ossl_kdf_sshkdf_functions }, + { PROV_NAMES_X963KDF, "provider=default", ossl_kdf_x963_kdf_functions }, + { PROV_NAMES_TLS1_PRF, "provider=default", ossl_kdf_tls1_prf_functions }, + { PROV_NAMES_KBKDF, "provider=default", ossl_kdf_kbkdf_functions }, + { PROV_NAMES_X942KDF_ASN1, "provider=default", ossl_kdf_x942_kdf_functions }, #ifndef OPENSSL_NO_SCRYPT - { "SCRYPT:id-scrypt", "provider=default", kdf_scrypt_functions }, + { PROV_NAMES_SCRYPT, "provider=default", ossl_kdf_scrypt_functions }, +#endif + { PROV_NAMES_KRB5KDF, "provider=default", ossl_kdf_krb5kdf_functions }, + { PROV_NAMES_HMAC_DRBG_KDF, "provider=default", + ossl_kdf_hmac_drbg_functions }, +#ifndef OPENSSL_NO_ARGON2 + { PROV_NAMES_ARGON2I, "provider=default", ossl_kdf_argon2i_functions }, + { PROV_NAMES_ARGON2D, "provider=default", ossl_kdf_argon2d_functions }, + { PROV_NAMES_ARGON2ID, "provider=default", ossl_kdf_argon2id_functions }, #endif - { "KRB5KDF", "provider=default", kdf_krb5kdf_functions }, { NULL, NULL, NULL } }; static const OSSL_ALGORITHM deflt_keyexch[] = { #ifndef OPENSSL_NO_DH - { "DH:dhKeyAgreement", "provider=default", dh_keyexch_functions }, + { PROV_NAMES_DH, "provider=default", ossl_dh_keyexch_functions }, #endif #ifndef OPENSSL_NO_EC - { "ECDH:id-ecPublicKey", "provider=default", ecdh_keyexch_functions }, - { "X25519", "provider=default", x25519_keyexch_functions }, - { "X448", "provider=default", x448_keyexch_functions }, + { PROV_NAMES_ECDH, "provider=default", ossl_ecdh_keyexch_functions }, +# ifndef OPENSSL_NO_ECX + { PROV_NAMES_X25519, "provider=default", ossl_x25519_keyexch_functions }, + { PROV_NAMES_X448, "provider=default", ossl_x448_keyexch_functions }, +# endif #endif + { PROV_NAMES_TLS1_PRF, "provider=default", ossl_kdf_tls1_prf_keyexch_functions }, + { PROV_NAMES_HKDF, "provider=default", ossl_kdf_hkdf_keyexch_functions }, + { PROV_NAMES_SCRYPT, "provider=default", + ossl_kdf_scrypt_keyexch_functions }, + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM deflt_rands[] = { + { PROV_NAMES_CTR_DRBG, "provider=default", ossl_drbg_ctr_functions }, + { PROV_NAMES_HASH_DRBG, "provider=default", ossl_drbg_hash_functions }, + { PROV_NAMES_HMAC_DRBG, "provider=default", ossl_drbg_ossl_hmac_functions }, + { PROV_NAMES_SEED_SRC, "provider=default", ossl_seed_src_functions }, + { PROV_NAMES_TEST_RAND, "provider=default", ossl_test_rng_functions }, { NULL, NULL, NULL } }; static const OSSL_ALGORITHM deflt_signature[] = { #ifndef OPENSSL_NO_DSA - { "DSA:dsaEncryption", "provider=default", dsa_signature_functions }, + { PROV_NAMES_DSA, "provider=default", ossl_dsa_signature_functions }, +#endif + { PROV_NAMES_RSA, "provider=default", ossl_rsa_signature_functions }, +#ifndef OPENSSL_NO_EC +# ifndef OPENSSL_NO_ECX + { PROV_NAMES_ED25519, "provider=default", ossl_ed25519_signature_functions }, + { PROV_NAMES_ED448, "provider=default", ossl_ed448_signature_functions }, +# endif + { PROV_NAMES_ECDSA, "provider=default", ossl_ecdsa_signature_functions }, +# ifndef OPENSSL_NO_SM2 + { PROV_NAMES_SM2, "provider=default", ossl_sm2_signature_functions }, +# endif +#endif + { PROV_NAMES_HMAC, "provider=default", ossl_mac_legacy_hmac_signature_functions }, + { PROV_NAMES_SIPHASH, "provider=default", + ossl_mac_legacy_siphash_signature_functions }, +#ifndef OPENSSL_NO_POLY1305 + { PROV_NAMES_POLY1305, "provider=default", + ossl_mac_legacy_poly1305_signature_functions }, +#endif +#ifndef OPENSSL_NO_CMAC + { PROV_NAMES_CMAC, "provider=default", ossl_mac_legacy_cmac_signature_functions }, #endif - { "RSA:rsaEncryption", "provider=default", rsa_signature_functions }, { NULL, NULL, NULL } }; static const OSSL_ALGORITHM deflt_asym_cipher[] = { - { "RSA:rsaEncryption", "provider=default", rsa_asym_cipher_functions }, + { PROV_NAMES_RSA, "provider=default", ossl_rsa_asym_cipher_functions }, +#ifndef OPENSSL_NO_SM2 + { PROV_NAMES_SM2, "provider=default", ossl_sm2_asym_cipher_functions }, +#endif + { NULL, NULL, NULL } +}; + +static const OSSL_ALGORITHM deflt_asym_kem[] = { + { PROV_NAMES_RSA, "provider=default", ossl_rsa_asym_kem_functions }, +#ifndef OPENSSL_NO_EC +# ifndef OPENSSL_NO_ECX + { PROV_NAMES_X25519, "provider=default", ossl_ecx_asym_kem_functions }, + { PROV_NAMES_X448, "provider=default", ossl_ecx_asym_kem_functions }, +# endif + { PROV_NAMES_EC, "provider=default", ossl_ec_asym_kem_functions }, +#endif { NULL, NULL, NULL } }; static const OSSL_ALGORITHM deflt_keymgmt[] = { #ifndef OPENSSL_NO_DH - { "DH:dhKeyAgreement", "provider=default", dh_keymgmt_functions }, + { PROV_NAMES_DH, "provider=default", ossl_dh_keymgmt_functions, + PROV_DESCS_DH }, + { PROV_NAMES_DHX, "provider=default", ossl_dhx_keymgmt_functions, + PROV_DESCS_DHX }, #endif #ifndef OPENSSL_NO_DSA - { "DSA:dsaEncryption", "provider=default", dsa_keymgmt_functions }, + { PROV_NAMES_DSA, "provider=default", ossl_dsa_keymgmt_functions, + PROV_DESCS_DSA}, #endif - { "RSA:rsaEncryption", "provider=default", rsa_keymgmt_functions }, + { PROV_NAMES_RSA, "provider=default", ossl_rsa_keymgmt_functions, + PROV_DESCS_RSA }, + { PROV_NAMES_RSA_PSS, "provider=default", ossl_rsapss_keymgmt_functions, + PROV_DESCS_RSA_PSS }, #ifndef OPENSSL_NO_EC - { "EC:id-ecPublicKey", "provider=default", ec_keymgmt_functions }, - { "X25519", "provider=default", x25519_keymgmt_functions }, - { "X448", "provider=default", x448_keymgmt_functions }, + { PROV_NAMES_EC, "provider=default", ossl_ec_keymgmt_functions, + PROV_DESCS_EC }, +# ifndef OPENSSL_NO_ECX + { PROV_NAMES_X25519, "provider=default", ossl_x25519_keymgmt_functions, + PROV_DESCS_X25519 }, + { PROV_NAMES_X448, "provider=default", ossl_x448_keymgmt_functions, + PROV_DESCS_X448 }, + { PROV_NAMES_ED25519, "provider=default", ossl_ed25519_keymgmt_functions, + PROV_DESCS_ED25519 }, + { PROV_NAMES_ED448, "provider=default", ossl_ed448_keymgmt_functions, + PROV_DESCS_ED448 }, +# endif +#endif + { PROV_NAMES_TLS1_PRF, "provider=default", ossl_kdf_keymgmt_functions, + PROV_DESCS_TLS1_PRF_SIGN }, + { PROV_NAMES_HKDF, "provider=default", ossl_kdf_keymgmt_functions, + PROV_DESCS_HKDF_SIGN }, + { PROV_NAMES_SCRYPT, "provider=default", ossl_kdf_keymgmt_functions, + PROV_DESCS_SCRYPT_SIGN }, + { PROV_NAMES_HMAC, "provider=default", ossl_mac_legacy_keymgmt_functions, + PROV_DESCS_HMAC_SIGN }, + { PROV_NAMES_SIPHASH, "provider=default", ossl_mac_legacy_keymgmt_functions, + PROV_DESCS_SIPHASH_SIGN }, +#ifndef OPENSSL_NO_POLY1305 + { PROV_NAMES_POLY1305, "provider=default", ossl_mac_legacy_keymgmt_functions, + PROV_DESCS_POLY1305_SIGN }, +#endif +#ifndef OPENSSL_NO_CMAC + { PROV_NAMES_CMAC, "provider=default", ossl_cmac_legacy_keymgmt_functions, + PROV_DESCS_CMAC_SIGN }, +#endif +#ifndef OPENSSL_NO_SM2 + { PROV_NAMES_SM2, "provider=default", ossl_sm2_keymgmt_functions, + PROV_DESCS_SM2 }, #endif { NULL, NULL, NULL } }; -/* - * Unlike most algorithms in the default provider, the serializers are allowed - * for use in FIPS mode because they are not FIPS relevant, and therefore have - * the "fips=yes" property. - */ -static const OSSL_ALGORITHM deflt_serializer[] = { - { "RSA", "provider=default,fips=yes,format=text,type=private", - rsa_priv_text_serializer_functions }, - { "RSA", "provider=default,fips=yes,format=text,type=public", - rsa_pub_text_serializer_functions }, - { "RSA", "provider=default,fips=yes,format=der,type=private", - rsa_priv_der_serializer_functions }, - { "RSA", "provider=default,fips=yes,format=der,type=public", - rsa_pub_der_serializer_functions }, - { "RSA", "provider=default,fips=yes,format=pem,type=private", - rsa_priv_pem_serializer_functions }, - { "RSA", "provider=default,fips=yes,format=pem,type=public", - rsa_pub_pem_serializer_functions }, +static const OSSL_ALGORITHM deflt_encoder[] = { +#define ENCODER_PROVIDER "default" +#include "encoders.inc" + { NULL, NULL, NULL } +#undef ENCODER_PROVIDER +}; -#ifndef OPENSSL_NO_DH - { "DH", "provider=default,fips=yes,format=text,type=private", - dh_priv_text_serializer_functions }, - { "DH", "provider=default,fips=yes,format=text,type=public", - dh_pub_text_serializer_functions }, - { "DH", "provider=default,fips=yes,format=text,type=parameters", - dh_param_text_serializer_functions }, - { "DH", "provider=default,fips=yes,format=der,type=private", - dh_priv_der_serializer_functions }, - { "DH", "provider=default,fips=yes,format=der,type=public", - dh_pub_der_serializer_functions }, - { "DH", "provider=default,fips=yes,format=der,type=parameters", - dh_param_der_serializer_functions }, - { "DH", "provider=default,fips=yes,format=pem,type=private", - dh_priv_pem_serializer_functions }, - { "DH", "provider=default,fips=yes,format=pem,type=public", - dh_pub_pem_serializer_functions }, - { "DH", "provider=default,fips=yes,format=pem,type=parameters", - dh_param_pem_serializer_functions }, -#endif +static const OSSL_ALGORITHM deflt_decoder[] = { +#define DECODER_PROVIDER "default" +#include "decoders.inc" + { NULL, NULL, NULL } +#undef DECODER_PROVIDER +}; -#ifndef OPENSSL_NO_DSA - { "DSA", "provider=default,fips=yes,format=text,type=private", - dsa_priv_text_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=text,type=public", - dsa_pub_text_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=text,type=parameters", - dsa_param_text_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=der,type=private", - dsa_priv_der_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=der,type=public", - dsa_pub_der_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=der,type=parameters", - dsa_param_der_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=pem,type=private", - dsa_priv_pem_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=pem,type=public", - dsa_pub_pem_serializer_functions }, - { "DSA", "provider=default,fips=yes,format=pem,type=parameters", - dsa_param_pem_serializer_functions }, -#endif +static const OSSL_ALGORITHM deflt_store[] = { +#define STORE(name, _fips, func_table) \ + { name, "provider=default,fips=" _fips, (func_table) }, -#ifndef OPENSSL_NO_EC - { "X25519", "provider=default,fips=yes,format=text,type=private", - x25519_priv_print_serializer_functions }, - { "X25519", "provider=default,fips=yes,format=text,type=public", - x25519_pub_print_serializer_functions }, - { "X25519", "provider=default,fips=yes,format=der,type=private", - x25519_priv_der_serializer_functions }, - { "X25519", "provider=default,fips=yes,format=der,type=public", - x25519_pub_der_serializer_functions }, - { "X25519", "provider=default,fips=yes,format=pem,type=private", - x25519_priv_pem_serializer_functions }, - { "X25519", "provider=default,fips=yes,format=pem,type=public", - x25519_pub_pem_serializer_functions }, - - { "X448", "provider=default,format=text,type=private", - x448_priv_print_serializer_functions }, - { "X448", "provider=default,format=text,type=public", - x448_pub_print_serializer_functions }, - { "X448", "provider=default,format=der,type=private", - x448_priv_der_serializer_functions }, - { "X448", "provider=default,format=der,type=public", - x448_pub_der_serializer_functions }, - { "X448", "provider=default,format=pem,type=private", - x448_priv_pem_serializer_functions }, - { "X448", "provider=default,format=pem,type=public", - x448_pub_pem_serializer_functions }, - - { "EC", "provider=default,fips=yes,format=text,type=private", - ec_priv_text_serializer_functions }, - { "EC", "provider=default,fips=yes,format=text,type=public", - ec_pub_text_serializer_functions }, - { "EC", "provider=default,fips=yes,format=text,type=parameters", - ec_param_text_serializer_functions }, - { "EC", "provider=default,fips=yes,format=der,type=private", - ec_priv_der_serializer_functions }, - { "EC", "provider=default,fips=yes,format=der,type=public", - ec_pub_der_serializer_functions }, - { "EC", "provider=default,fips=yes,format=der,type=parameters", - ec_param_der_serializer_functions }, - { "EC", "provider=default,fips=yes,format=pem,type=private", - ec_priv_pem_serializer_functions }, - { "EC", "provider=default,fips=yes,format=pem,type=public", - ec_pub_pem_serializer_functions }, - { "EC", "provider=default,fips=yes,format=pem,type=parameters", - ec_param_pem_serializer_functions }, -#endif +#include "stores.inc" { NULL, NULL, NULL } +#undef STORE }; -static const OSSL_ALGORITHM *deflt_query(OSSL_PROVIDER *prov, - int operation_id, +static const OSSL_ALGORITHM *deflt_query(void *provctx, int operation_id, int *no_cache) { *no_cache = 0; @@ -528,12 +524,13 @@ static const OSSL_ALGORITHM *deflt_query(OSSL_PROVIDER *prov, case OSSL_OP_DIGEST: return deflt_digests; case OSSL_OP_CIPHER: - ossl_prov_cache_exported_algorithms(deflt_ciphers, exported_ciphers); return exported_ciphers; case OSSL_OP_MAC: return deflt_macs; case OSSL_OP_KDF: return deflt_kdfs; + case OSSL_OP_RAND: + return deflt_rands; case OSSL_OP_KEYMGMT: return deflt_keymgmt; case OSSL_OP_KEYEXCH: @@ -542,41 +539,59 @@ static const OSSL_ALGORITHM *deflt_query(OSSL_PROVIDER *prov, return deflt_signature; case OSSL_OP_ASYM_CIPHER: return deflt_asym_cipher; - case OSSL_OP_SERIALIZER: - return deflt_serializer; + case OSSL_OP_KEM: + return deflt_asym_kem; + case OSSL_OP_ENCODER: + return deflt_encoder; + case OSSL_OP_DECODER: + return deflt_decoder; + case OSSL_OP_STORE: + return deflt_store; } return NULL; } + +static void deflt_teardown(void *provctx) +{ + BIO_meth_free(ossl_prov_ctx_get0_core_bio_method(provctx)); + ossl_prov_ctx_free(provctx); +} + /* Functions we provide to the core */ static const OSSL_DISPATCH deflt_dispatch_table[] = { + { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))deflt_teardown }, { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))deflt_gettable_params }, { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))deflt_get_params }, { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))deflt_query }, - { 0, NULL } + { OSSL_FUNC_PROVIDER_GET_CAPABILITIES, + (void (*)(void))ossl_prov_get_capabilities }, + OSSL_DISPATCH_END }; OSSL_provider_init_fn ossl_default_provider_init; -int ossl_default_provider_init(const OSSL_PROVIDER *provider, +int ossl_default_provider_init(const OSSL_CORE_HANDLE *handle, const OSSL_DISPATCH *in, const OSSL_DISPATCH **out, void **provctx) { - OSSL_core_get_library_context_fn *c_get_libctx = NULL; + OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL; + BIO_METHOD *corebiometh; - if (!ossl_prov_bio_from_dispatch(in)) + if (!ossl_prov_bio_from_dispatch(in) + || !ossl_prov_seeding_from_dispatch(in)) return 0; for (; in->function_id != 0; in++) { switch (in->function_id) { case OSSL_FUNC_CORE_GETTABLE_PARAMS: - c_gettable_params = OSSL_get_core_gettable_params(in); + c_gettable_params = OSSL_FUNC_core_gettable_params(in); break; case OSSL_FUNC_CORE_GET_PARAMS: - c_get_params = OSSL_get_core_get_params(in); + c_get_params = OSSL_FUNC_core_get_params(in); break; - case OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT: - c_get_libctx = OSSL_get_core_get_library_context(in); + case OSSL_FUNC_CORE_GET_LIBCTX: + c_get_libctx = OSSL_FUNC_core_get_libctx(in); break; default: /* Just ignore anything we don't understand */ @@ -587,13 +602,27 @@ int ossl_default_provider_init(const OSSL_PROVIDER *provider, if (c_get_libctx == NULL) return 0; - *out = deflt_dispatch_table; - /* * We want to make sure that all calls from this provider that requires * a library context use the same context as the one used to call our - * functions. We do that by passing it along as the provider context. + * functions. We do that by passing it along in the provider context. + * + * This only works for built-in providers. Most providers should + * create their own library context. */ - *provctx = c_get_libctx(provider); + if ((*provctx = ossl_prov_ctx_new()) == NULL + || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) { + ossl_prov_ctx_free(*provctx); + *provctx = NULL; + return 0; + } + ossl_prov_ctx_set0_libctx(*provctx, + (OSSL_LIB_CTX *)c_get_libctx(handle)); + ossl_prov_ctx_set0_handle(*provctx, handle); + ossl_prov_ctx_set0_core_bio_method(*provctx, corebiometh); + + *out = deflt_dispatch_table; + ossl_prov_cache_exported_algorithms(deflt_ciphers, exported_ciphers); + return 1; }