Commit 2f958ccb78 for openssl.org

commit 2f958ccb783ed1b0f60729c7668318907f1a82f6
Author: Daiki Ueno <dueno@redhat.com>
Date:   Wed Sep 9 17:12:05 2026 +0900

    crypto: instrument ML-KEM for crypto-auditing

    Signed-off-by: Daiki Ueno <dueno@redhat.com>

    Reviewed-by: Mounir Idrassi <mounir.idrassi@idrix.fr>
    Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
    MergeDate: Sat Nov 21 14:48:31 2026
    (Merged from https://github.com/openssl/openssl/pull/32538)

diff --git a/providers/implementations/kem/ml_kem_kem.c b/providers/implementations/kem/ml_kem_kem.c
index e6e4bcd672..81596b40a7 100644
--- a/providers/implementations/kem/ml_kem_kem.c
+++ b/providers/implementations/kem/ml_kem_kem.c
@@ -18,6 +18,7 @@
 #include "crypto/ml_kem.h"
 #include "internal/cryptlib.h"
 #include "internal/fips.h"
+#include "internal/usdt.h"
 #include "prov/provider_ctx.h"
 #include "prov/implementations.h"
 #include "prov/securitycheck.h"
@@ -117,7 +118,12 @@ static int ml_kem_encapsulate_init(void *vctx, void *vkey,
         ERR_raise(ERR_LIB_PROV, PROV_R_MISSING_KEY);
         return 0;
     }
-    return ml_kem_init(vctx, EVP_PKEY_OP_ENCAPSULATE, key, params);
+    if (!ml_kem_init(vctx, EVP_PKEY_OP_ENCAPSULATE, key, params))
+        return 0;
+
+    OSSL_USDT_new_context_with_data(vctx, "pk::encapsulate", { "pk::algorithm", OSSL_USDT_STRING("ML-KEM") });
+
+    return 1;
 }

 static int ml_kem_decapsulate_init(void *vctx, void *vkey,
@@ -129,7 +135,12 @@ static int ml_kem_decapsulate_init(void *vctx, void *vkey,
         ERR_raise(ERR_LIB_PROV, PROV_R_MISSING_KEY);
         return 0;
     }
-    return ml_kem_init(vctx, EVP_PKEY_OP_DECAPSULATE, key, params);
+    if (!ml_kem_init(vctx, EVP_PKEY_OP_DECAPSULATE, key, params))
+        return 0;
+
+    OSSL_USDT_new_context_with_data(vctx, "pk::decapsulate", { "pk::algorithm", OSSL_USDT_STRING("ML-KEM") });
+
+    return 1;
 }

 static int ml_kem_set_ctx_params(void *vctx, const OSSL_PARAM params[])
diff --git a/providers/implementations/kem/mlx_kem.c b/providers/implementations/kem/mlx_kem.c
index 5ba5595e52..60db9660db 100644
--- a/providers/implementations/kem/mlx_kem.c
+++ b/providers/implementations/kem/mlx_kem.c
@@ -220,6 +220,7 @@ static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
             key->minfo->algorithm_name, (unsigned long)encap_slen);
         goto end;
     }
+    OSSL_USDT_release_context(ctx);
     EVP_PKEY_CTX_free(ctx);

     /*-
@@ -253,6 +254,7 @@ static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
             key->xinfo->algorithm_name, (unsigned long)encap_clen);
         goto end;
     }
+    OSSL_USDT_release_context(ctx);
     EVP_PKEY_CTX_free(ctx);

     /* Derive the ECDH shared secret */
@@ -279,6 +281,7 @@ end:
         OPENSSL_cleanse(shsec,
             ML_KEM_SHARED_SECRET_BYTES + key->xinfo->shsec_bytes);
     EVP_PKEY_free(xkey);
+    OSSL_USDT_release_context(ctx);
     EVP_PKEY_CTX_free(ctx);
     return ret;
 }
@@ -342,6 +345,7 @@ static int mlx_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
             key->minfo->algorithm_name, (unsigned long)decap_slen);
         goto end;
     }
+    OSSL_USDT_release_context(ctx);
     EVP_PKEY_CTX_free(ctx);

     /* ECDH decapsulation */
@@ -372,6 +376,7 @@ end:
     if (ret == 0)
         OPENSSL_cleanse(shsec,
             ML_KEM_SHARED_SECRET_BYTES + key->xinfo->shsec_bytes);
+    OSSL_USDT_release_context(ctx);
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(xkey);
     return ret;