[TEMP] wire in x25519/x448 hybrid

paulidale · Jan 6, 2025 · 917caf7 · 917caf7
1 parent 6f1c9ec
commit 917caf7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/providers/defltprov.c b/providers/defltprov.c
@@ -476,6 +476,10 @@ static const OSSL_ALGORITHM deflt_asym_kem[] = {
     { PROV_NAMES_X448, "provider=default", ossl_ecx_asym_kem_functions },
 # endif
     { PROV_NAMES_EC, "provider=default", ossl_ec_asym_kem_functions },
+# ifndef OPENSSL_NO_ECX
+    /* Temporary until PQC hybrids exist */
+    { "X25519-X448", "provider=default", ossl_X25519_X448_kem_functions },
+# endif
 #endif
 #ifndef OPENSSL_NO_ML_KEM
     { PROV_NAMES_ML_KEM_512, "provider=default", ossl_ml_kem_asym_kem_functions },
@@ -513,6 +517,11 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = {
     { PROV_NAMES_ED448, "provider=default", ossl_ed448_keymgmt_functions,
       PROV_DESCS_ED448 },
 # endif
+# ifndef OPENSSL_NO_ECX
+    /* Temporary until PQC hybrids exist */
+    { "X25519-X448", "provider=default", ossl_X25519_X448_kmgmt_functions,
+      "X25519-X448 hybrid implementation" },
+# endif
 #endif
     { PROV_NAMES_TLS1_PRF, "provider=default", ossl_kdf_keymgmt_functions,
       PROV_DESCS_TLS1_PRF_SIGN },

diff --git a/providers/implementations/include/prov/implementations.h b/providers/implementations/include/prov/implementations.h
@@ -593,3 +593,8 @@ extern const OSSL_DISPATCH ossl_pem_to_der_decoder_functions[];
 
 extern const OSSL_DISPATCH ossl_file_store_functions[];
 extern const OSSL_DISPATCH ossl_winstore_store_functions[];
+
+#ifndef OPENSSL_NO_ECX
+extern const OSSL_DISPATCH ossl_X25519_X448_kem_functions[];
+extern const OSSL_DISPATCH ossl_X25519_X448_kmgmt_functions[];
+#endif