Add AES_CBC_HMAC_SHA ciphers to providers.

Also Add ability for providers to dynamically exclude cipher algorithms.
Cipher algorithms are only returned from providers if their capable() method is either NULL,
or the method returns 1.
This is mainly required for ciphers that only have hardware implementations.
If there is no hardware support, then the algorithm needs to be not available.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10146)

1 files changed, 165 insertions, 152 deletions

diff --git a/providers/defltprov.c b/providers/defltprov.c
index 51cd2b9..5c11b4a 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -15,7 +15,13 @@
 #include <openssl/core_names.h>
 #include <openssl/params.h>
 #include "prov/bio.h"
+#include "prov/providercommon.h"
 #include "prov/implementations.h"
+#include "prov/provider_util.h"
+#include "internal/nelem.h"
+
+#define ALGC(NAMES, FUNC, CHECK) { { NAMES, "default=yes", 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;
@@ -131,190 +137,196 @@ static const OSSL_ALGORITHM deflt_digests[] = {
     { NULL, NULL, NULL }
 };
 
-static const OSSL_ALGORITHM deflt_ciphers[] = {
-    { "AES-256-ECB", "default=yes", aes256ecb_functions },
-    { "AES-192-ECB", "default=yes", aes192ecb_functions },
-    { "AES-128-ECB", "default=yes", aes128ecb_functions },
-    { "AES-256-CBC", "default=yes", aes256cbc_functions },
-    { "AES-192-CBC", "default=yes", aes192cbc_functions },
-    { "AES-128-CBC", "default=yes", aes128cbc_functions },
-    { "AES-256-OFB", "default=yes", aes256ofb_functions },
-    { "AES-192-OFB", "default=yes", aes192ofb_functions },
-    { "AES-128-OFB", "default=yes", aes128ofb_functions },
-    { "AES-256-CFB", "default=yes", aes256cfb_functions },
-    { "AES-192-CFB", "default=yes", aes192cfb_functions },
-    { "AES-128-CFB", "default=yes", aes128cfb_functions },
-    { "AES-256-CFB1", "default=yes", aes256cfb1_functions },
-    { "AES-192-CFB1", "default=yes", aes192cfb1_functions },
-    { "AES-128-CFB1", "default=yes", aes128cfb1_functions },
-    { "AES-256-CFB8", "default=yes", aes256cfb8_functions },
-    { "AES-192-CFB8", "default=yes", aes192cfb8_functions },
-    { "AES-128-CFB8", "default=yes", aes128cfb8_functions },
-    { "AES-256-CTR", "default=yes", aes256ctr_functions },
-    { "AES-192-CTR", "default=yes", aes192ctr_functions },
-    { "AES-128-CTR", "default=yes", aes128ctr_functions },
-    { "AES-256-XTS", "default=yes", aes256xts_functions },
-    { "AES-128-XTS", "default=yes", aes128xts_functions },
+static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = {
+    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),
 #ifndef OPENSSL_NO_OCB
-    { "AES-256-OCB", "default=yes", aes256ocb_functions },
-    { "AES-192-OCB", "default=yes", aes192ocb_functions },
-    { "AES-128-OCB", "default=yes", aes128ocb_functions },
+    ALG("AES-256-OCB", aes256ocb_functions),
+    ALG("AES-192-OCB", aes192ocb_functions),
+    ALG("AES-128-OCB", aes128ocb_functions),
 #endif /* OPENSSL_NO_OCB */
 #ifndef OPENSSL_NO_SIV
-    { "AES-128-SIV", "default=yes", aes128siv_functions },
-    { "AES-192-SIV", "default=yes", aes192siv_functions },
-    { "AES-256-SIV", "default=yes", aes256siv_functions },
+    ALG("AES-128-SIV", aes128siv_functions),
+    ALG("AES-192-SIV", aes192siv_functions),
+    ALG("AES-256-SIV", aes256siv_functions),
 #endif /* OPENSSL_NO_SIV */
-    { "AES-256-GCM:id-aes256-GCM", "default=yes", aes256gcm_functions },
-    { "AES-192-GCM:id-aes192-GCM", "default=yes", aes192gcm_functions },
-    { "AES-128-GCM:id-aes128-GCM", "default=yes", aes128gcm_functions },
-    { "AES-256-CCM:id-aes256-CCM", "default=yes", aes256ccm_functions },
-    { "AES-192-CCM:id-aes192-CCM", "default=yes", aes192ccm_functions },
-    { "AES-128-CCM:id-aes128-CCM", "default=yes", aes128ccm_functions },
-    { "AES-256-WRAP:id-aes256-wrap:AES256-WRAP", "default=yes",
-      aes256wrap_functions },
-    { "AES-192-WRAP:id-aes192-wrap:AES192-WRAP", "default=yes",
-      aes192wrap_functions },
-    { "AES-128-WRAP:id-aes128-wrap:AES128-WRAP", "default=yes",
-      aes128wrap_functions },
-    { "AES-256-WRAP-PAD:id-aes256-wrap-pad:AES256-WRAP-PAD", "default=yes",
-      aes256wrappad_functions },
-    { "AES-192-WRAP-PAD:id-aes192-wrap-pad:AES192-WRAP-PAD", "default=yes",
-      aes192wrappad_functions },
-    { "AES-128-WRAP-PAD:id-aes128-wrap-pad:AES128-WRAP-PAD", "default=yes",
-      aes128wrappad_functions },
+    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),
 #ifndef OPENSSL_NO_ARIA
-    { "ARIA-256-GCM", "default=yes", aria256gcm_functions },
-    { "ARIA-192-GCM", "default=yes", aria192gcm_functions },
-    { "ARIA-128-GCM", "default=yes", aria128gcm_functions },
-    { "ARIA-256-CCM", "default=yes", aria256ccm_functions },
-    { "ARIA-192-CCM", "default=yes", aria192ccm_functions },
-    { "ARIA-128-CCM", "default=yes", aria128ccm_functions },
-    { "ARIA-256-ECB", "default=yes", aria256ecb_functions },
-    { "ARIA-192-ECB", "default=yes", aria192ecb_functions },
-    { "ARIA-128-ECB", "default=yes", aria128ecb_functions },
-    { "ARIA-256-CBC:ARIA256", "default=yes", aria256cbc_functions },
-    { "ARIA-192-CBC:ARIA192", "default=yes", aria192cbc_functions },
-    { "ARIA-128-CBC:ARIA128", "default=yes", aria128cbc_functions },
-    { "ARIA-256-OFB", "default=yes", aria256ofb_functions },
-    { "ARIA-192-OFB", "default=yes", aria192ofb_functions },
-    { "ARIA-128-OFB", "default=yes", aria128ofb_functions },
-    { "ARIA-256-CFB", "default=yes", aria256cfb_functions },
-    { "ARIA-192-CFB", "default=yes", aria192cfb_functions },
-    { "ARIA-128-CFB", "default=yes", aria128cfb_functions },
-    { "ARIA-256-CFB1", "default=yes", aria256cfb1_functions },
-    { "ARIA-192-CFB1", "default=yes", aria192cfb1_functions },
-    { "ARIA-128-CFB1", "default=yes", aria128cfb1_functions },
-    { "ARIA-256-CFB8", "default=yes", aria256cfb8_functions },
-    { "ARIA-192-CFB8", "default=yes", aria192cfb8_functions },
-    { "ARIA-128-CFB8", "default=yes", aria128cfb8_functions },
-    { "ARIA-256-CTR", "default=yes", aria256ctr_functions },
-    { "ARIA-192-CTR", "default=yes", aria192ctr_functions },
-    { "ARIA-128-CTR", "default=yes", aria128ctr_functions },
+    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),
 #endif /* OPENSSL_NO_ARIA */
 #ifndef OPENSSL_NO_CAMELLIA
-    { "CAMELLIA-256-ECB", "default=yes", camellia256ecb_functions },
-    { "CAMELLIA-192-ECB", "default=yes", camellia192ecb_functions },
-    { "CAMELLIA-128-ECB", "default=yes", camellia128ecb_functions },
-    { "CAMELLIA-256-CBC:CAMELLIA256", "default=yes", camellia256cbc_functions },
-    { "CAMELLIA-192-CBC:CAMELLIA192", "default=yes", camellia192cbc_functions },
-    { "CAMELLIA-128-CBC:CAMELLIA128", "default=yes", camellia128cbc_functions },
-    { "CAMELLIA-256-OFB", "default=yes", camellia256ofb_functions },
-    { "CAMELLIA-192-OFB", "default=yes", camellia192ofb_functions },
-    { "CAMELLIA-128-OFB", "default=yes", camellia128ofb_functions },
-    { "CAMELLIA-256-CFB", "default=yes", camellia256cfb_functions },
-    { "CAMELLIA-192-CFB", "default=yes", camellia192cfb_functions },
-    { "CAMELLIA-128-CFB", "default=yes", camellia128cfb_functions },
-    { "CAMELLIA-256-CFB1", "default=yes", camellia256cfb1_functions },
-    { "CAMELLIA-192-CFB1", "default=yes", camellia192cfb1_functions },
-    { "CAMELLIA-128-CFB1", "default=yes", camellia128cfb1_functions },
-    { "CAMELLIA-256-CFB8", "default=yes", camellia256cfb8_functions },
-    { "CAMELLIA-192-CFB8", "default=yes", camellia192cfb8_functions },
-    { "CAMELLIA-128-CFB8", "default=yes", camellia128cfb8_functions },
-    { "CAMELLIA-256-CTR", "default=yes", camellia256ctr_functions },
-    { "CAMELLIA-192-CTR", "default=yes", camellia192ctr_functions },
-    { "CAMELLIA-128-CTR", "default=yes", camellia128ctr_functions },
+    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),
 #endif /* OPENSSL_NO_CAMELLIA */
 #ifndef OPENSSL_NO_DES
-    { "DES-EDE3-ECB:DES-EDE3", "default=yes", tdes_ede3_ecb_functions },
-    { "DES-EDE3-CBC:DES3", "default=yes", tdes_ede3_cbc_functions },
-    { "DES-EDE3-OFB", "default=yes", tdes_ede3_ofb_functions },
-    { "DES-EDE3-CFB", "default=yes", tdes_ede3_cfb_functions },
-    { "DES-EDE3-CFB8", "default=yes", tdes_ede3_cfb8_functions },
-    { "DES-EDE3-CFB1", "default=yes", tdes_ede3_cfb1_functions },
-    { "DES-EDE-ECB:DES-EDE", "default=yes", tdes_ede2_ecb_functions },
-    { "DES-EDE-CBC", "default=yes", tdes_ede2_cbc_functions },
-    { "DES-EDE-OFB", "default=yes", tdes_ede2_ofb_functions },
-    { "DES-EDE-CFB", "default=yes", tdes_ede2_cfb_functions },
-    { "DESX-CBC:DESX", "default=yes", tdes_desx_cbc_functions },
-    { "DES3-WRAP:id-smime-alg-CMS3DESwrap", "default=yes", tdes_wrap_cbc_functions },
-    { "DES-ECB", "default=yes", des_ecb_functions },
-    { "DES-CBC:DES", "default=yes", des_cbc_functions },
-    { "DES-OFB", "default=yes", des_ofb64_functions },
-    { "DES-CFB", "default=yes", des_cfb64_functions },
-    { "DES-CFB1", "default=yes", des_cfb1_functions },
-    { "DES-CFB8", "default=yes", des_cfb8_functions },
+    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),
 #endif /* OPENSSL_NO_DES */
 #ifndef OPENSSL_NO_BF
-    { "BF-ECB", "default=yes", blowfish128ecb_functions },
-    { "BF-CBC:BF:BLOWFISH", "default=yes", blowfish128cbc_functions },
-    { "BF-OFB", "default=yes", blowfish64ofb64_functions },
-    { "BF-CFB", "default=yes", blowfish64cfb64_functions },
+    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
-    { "IDEA-ECB", "default=yes", idea128ecb_functions },
-    { "IDEA-CBC:IDEA", "default=yes", idea128cbc_functions },
-    { "IDEA-OFB:IDEA-OFB64", "default=yes", idea128ofb64_functions },
-    { "IDEA-CFB:IDEA-CFB64", "default=yes", idea128cfb64_functions },
+    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
-    { "CAST5-ECB", "default=yes", cast5128ecb_functions },
-    { "CAST5-CBC:CAST-CBC:CAST", "default=yes", cast5128cbc_functions },
-    { "CAST5-OFB", "default=yes", cast564ofb64_functions },
-    { "CAST5-CFB", "default=yes", cast564cfb64_functions },
+    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
-    { "SEED-ECB", "default=yes", seed128ecb_functions },
-    { "SEED-CBC:SEED", "default=yes", seed128cbc_functions },
-    { "SEED-OFB:SEED-OFB128", "default=yes", seed128ofb128_functions },
-    { "SEED-CFB:SEED-CFB128", "default=yes", seed128cfb128_functions },
+    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
-    { "SM4-ECB", "default=yes", sm4128ecb_functions },
-    { "SM4-CBC:SM4", "default=yes", sm4128cbc_functions },
-    { "SM4-CTR", "default=yes", sm4128ctr_functions },
-    { "SM4-OFB:SM4-OFB128", "default=yes", sm4128ofb128_functions },
-    { "SM4-CFB:SM4-CFB128", "default=yes", sm4128cfb128_functions },
+    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),
 #endif /* OPENSSL_NO_SM4 */
 #ifndef OPENSSL_NO_RC4
-    { "RC4", "default=yes", rc4128_functions },
-    { "RC4-40", "default=yes", rc440_functions },
+    ALG("RC4", rc4128_functions),
+    ALG("RC4-40", rc440_functions),
 # ifndef OPENSSL_NO_MD5
-    { "RC4-HMAC-MD5", "default=yes", rc4_hmac_md5_functions },
+    ALG("RC4-HMAC-MD5", rc4_hmac_md5_functions),
 # endif /* OPENSSL_NO_MD5 */
 #endif /* OPENSSL_NO_RC4 */
 #ifndef OPENSSL_NO_RC5
-    { "RC5-ECB", "default=yes", rc5128ecb_functions },
-    { "RC5-CBC", "default=yes", rc5128cbc_functions },
-    { "RC5-OFB", "default=yes", rc5128ofb64_functions },
-    { "RC5-CFB", "default=yes", rc5128cfb64_functions },
+    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
-    { "RC2-ECB", "default=yes", rc2128ecb_functions },
-    { "RC2-CBC", "default=yes", rc2128cbc_functions },
-    { "RC2-40-CBC", "default=yes", rc240cbc_functions },
-    { "RC2-64-CBC", "default=yes", rc264cbc_functions },
-    { "RC2-CFB", "default=yes", rc2128cfb128_functions },
-    { "RC2-OFB", "default=yes", rc2128ofb128_functions },
+    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
-    { "ChaCha20", "default=yes", chacha20_functions },
+    ALG("ChaCha20", chacha20_functions),
 # ifndef OPENSSL_NO_POLY1305
-    { "ChaCha20-Poly1305", "default=yes", chacha20_poly1305_functions },
+    ALG("ChaCha20-Poly1305", chacha20_poly1305_functions),
 # endif /* OPENSSL_NO_POLY1305 */
 #endif /* OPENSSL_NO_CHACHA */
-    { NULL, NULL, NULL }
+    { { NULL, NULL, NULL }, NULL }
 };
+static OSSL_ALGORITHM exported_ciphers[OSSL_NELEM(deflt_ciphers)];
 
 static const OSSL_ALGORITHM deflt_macs[] = {
 #ifndef OPENSSL_NO_BLAKE2
@@ -432,7 +444,8 @@ static const OSSL_ALGORITHM *deflt_query(OSSL_PROVIDER *prov,
     case OSSL_OP_DIGEST:
         return deflt_digests;
     case OSSL_OP_CIPHER:
-        return deflt_ciphers;
+        ossl_prov_cache_exported_algorithms(deflt_ciphers, exported_ciphers);
+        return exported_ciphers;
     case OSSL_OP_MAC:
         return deflt_macs;
     case OSSL_OP_KDF: