PR comments

Author: mamckee

ScosslCommon/src/scossl_ecc.c

@@ -116,6 +116,11 @@ PCSYMCRYPT_ECURVE scossl_ecc_group_to_symcrypt_curve(const EC_GROUP *group)
     return scossl_ecc_nid_to_symcrypt_curve(EC_GROUP_get_curve_name(group));
 }
 
+PCSYMCRYPT_ECURVE scossl_ecc_get_x25519_curve()
+{
+    return _hidden_curve_X25519;
+}
+
 _Use_decl_annotations_
 EC_GROUP *scossl_ecc_symcrypt_curve_to_ecc_group(PCSYMCRYPT_ECURVE pCurve)
 {

SymCryptProvider/src/encoder/p_scossl_encode_mlkem.c

@@ -376,7 +376,7 @@ static SCOSSL_STATUS p_scossl_mlkem_to_text(ossl_unused SCOSSL_ENCODE_CTX *ctx,
         pbKey = NULL;
         cbKey = 0;
 
-        if (p_scossl_mlkem_keymgmt_get_encoded_key(keyCtx, OSSL_KEYMGMT_SELECT_PUBLIC_KEY, &pbKey, &cbKey) != SCOSSL_SUCCESS)
+        if (p_scossl_mlkem_keymgmt_get_encoded_key(keyCtx, SYMCRYPT_MLKEMKEY_FORMAT_ENCAPSULATION_KEY, &pbKey, &cbKey) != SCOSSL_SUCCESS)
         {
             goto cleanup;
         }

SymCryptProvider/src/p_scossl_base.c

@@ -750,15 +750,6 @@ SCOSSL_STATUS OSSL_provider_init(_In_ const OSSL_CORE_HANDLE *handle,
     p_ctx->handle = handle;
     p_ctx->libctx = OSSL_LIB_CTX_new_child(handle, in);
 
-    p_scossl_setup_logging(handle);
-
-    p_scossl_set_core_bio(in);
-    if ((p_ctx->coreBioMeth = p_scossl_bio_init()) == NULL)
-    {
-        ERR_raise(ERR_LIB_PROV, ERR_R_INIT_FAIL);
-        goto cleanup;
-    }
-
     for (; in->function_id != 0; in++)
     {
         switch(in->function_id)
@@ -769,6 +760,15 @@ SCOSSL_STATUS OSSL_provider_init(_In_ const OSSL_CORE_HANDLE *handle,
         }
     }
 
+    p_scossl_setup_logging(handle);
+
+    p_scossl_set_core_bio(in);
+    if ((p_ctx->coreBioMeth = p_scossl_bio_init()) == NULL)
+    {
+        ERR_raise(ERR_LIB_PROV, ERR_R_INIT_FAIL);
+        goto cleanup;
+    }
+
     if (!scossl_prov_initialized)
     {
         SymCryptModuleInit(P_SCOSSL_SYMCRYPT_MINIMUM_MAJOR, P_SCOSSL_SYMCRYPT_MINIMUM_MINOR);

SymCryptProvider/src/p_scossl_bio.c

@@ -8,13 +8,13 @@
 extern "C" {
 #endif
 
-OSSL_FUNC_BIO_read_ex_fn *core_bio_read_ex = NULL;
-OSSL_FUNC_BIO_write_ex_fn *core_bio_write_ex = NULL;
-OSSL_FUNC_BIO_up_ref_fn *core_bio_up_ref = NULL;
-OSSL_FUNC_BIO_free_fn *core_bio_free = NULL;
-OSSL_FUNC_BIO_gets_fn *core_bio_gets = NULL;
-OSSL_FUNC_BIO_puts_fn *core_bio_puts = NULL;
-OSSL_FUNC_BIO_ctrl_fn *core_bio_ctrl = NULL;
+static OSSL_FUNC_BIO_read_ex_fn *core_bio_read_ex = NULL;
+static OSSL_FUNC_BIO_write_ex_fn *core_bio_write_ex = NULL;
+static OSSL_FUNC_BIO_up_ref_fn *core_bio_up_ref = NULL;
+static OSSL_FUNC_BIO_free_fn *core_bio_free = NULL;
+static OSSL_FUNC_BIO_gets_fn *core_bio_gets = NULL;
+static OSSL_FUNC_BIO_puts_fn *core_bio_puts = NULL;
+static OSSL_FUNC_BIO_ctrl_fn *core_bio_ctrl = NULL;
 
 static SCOSSL_STATUS p_scossl_bio_core_read_ex(BIO *bio, char *data, size_t data_len,
                                                size_t *bytes_read)