Commit 5b98ec54ef for openssl.org

commit 5b98ec54efeaed632edca26a22a2ab94bc9afef5
Author: Daiki Ueno <dueno@redhat.com>
Date:   Sun Jul 12 07:58:59 2026 +0900

    ssl: instrument TLS handshake for crypto-auditing

    This adds crypto-auditing instrumentation around a TLS handshake
    according to the event schema definition:
    https://github.com/latchset/crypto-auditing/blob/main/docs/registry.md#tls

    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:29 2026
    (Merged from https://github.com/openssl/openssl/pull/32538)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 8157622aa5..3a54ac0c3e 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -22,6 +22,7 @@
 #include <openssl/core_names.h>
 #include "internal/cryptlib.h"
 #include "internal/ssl_unwrap.h"
+#include "internal/usdt.h"
 #include <openssl/ocsp.h>

 #define TLS13_NUM_CIPHERS OSSL_NELEM(tls13_ciphers)
@@ -5511,6 +5512,8 @@ int ssl_derive(SSL_CONNECTION *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gense

     pctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx, privkey, sctx->propq);

+    OSSL_USDT_new_child(s, pctx);
+
     if (EVP_PKEY_derive_init(pctx) <= 0
         || EVP_PKEY_derive_set_peer(pctx, pubkey) <= 0
         || EVP_PKEY_derive(pctx, NULL, &pmslen) <= 0) {
@@ -5548,6 +5551,7 @@ int ssl_derive(SSL_CONNECTION *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gense

 err:
     OPENSSL_clear_free(pms, pmslen);
+    OSSL_USDT_release_context(pctx);
     EVP_PKEY_CTX_free(pctx);
     return rv;
 }
@@ -5570,6 +5574,8 @@ int ssl_decapsulate(SSL_CONNECTION *s, EVP_PKEY *privkey,

     pctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx, privkey, sctx->propq);

+    OSSL_USDT_new_child(s, pctx);
+
     if (EVP_PKEY_decapsulate_init(pctx, NULL) <= 0
         || EVP_PKEY_decapsulate(pctx, NULL, &pmslen, ct, ctlen) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -5600,6 +5606,7 @@ int ssl_decapsulate(SSL_CONNECTION *s, EVP_PKEY *privkey,

 err:
     OPENSSL_clear_free(pms, pmslen);
+    OSSL_USDT_release_context(pctx);
     EVP_PKEY_CTX_free(pctx);
     return rv;
 }
@@ -5621,6 +5628,8 @@ int ssl_encapsulate(SSL_CONNECTION *s, EVP_PKEY *pubkey,

     pctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx, pubkey, sctx->propq);

+    OSSL_USDT_new_child(s, pctx);
+
     if (EVP_PKEY_encapsulate_init(pctx, NULL) <= 0
         || EVP_PKEY_encapsulate(pctx, NULL, &ctlen, NULL, &pmslen) <= 0
         || pmslen == 0 || ctlen == 0) {
@@ -5661,6 +5670,7 @@ int ssl_encapsulate(SSL_CONNECTION *s, EVP_PKEY *pubkey,
 err:
     OPENSSL_clear_free(pms, pmslen);
     OPENSSL_free(ct);
+    OSSL_USDT_release_context(pctx);
     EVP_PKEY_CTX_free(pctx);
     return rv;
 }
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 336bd5efe1..c73eb0a87a 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -32,6 +32,7 @@
 #include "internal/ktls.h"
 #include "internal/to_hex.h"
 #include "internal/ssl_unwrap.h"
+#include "internal/usdt.h"
 #include "quic/quic_local.h"

 #ifndef OPENSSL_NO_SSLKEYLOG
@@ -1613,6 +1614,8 @@ void ossl_ssl_connection_free(SSL *ssl)
         return;
     }

+    OSSL_USDT_release_context(s);
+
     if (s->d1 != NULL && s->rlayer.wrl != NULL)
         dtls1_clear_current_wrl_from_sent_buffer(s);

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index edb4d19bab..490167e747 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -17,6 +17,7 @@
 #ifndef OPENSSL_NO_ECH
 #include "internal/ech_helpers.h"
 #endif
+#include "internal/usdt.h"

 /* Used in the negotiate_dhe function */
 typedef enum {
@@ -2452,6 +2453,9 @@ int tls_parse_stoc_key_share(SSL_CONNECTION *s, PACKET *pkt,
         return 0;
     }

+    OSSL_USDT_new_context_with_data(s, "tls::key_exchange",
+        { "tls::group", OSSL_USDT_WORD(group_id) });
+
     if (!ginf->is_kem) {
         /* Regular KEX */
         skey = EVP_PKEY_new();
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index 512f677f79..8bd856af3f 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -16,6 +16,7 @@
 #include <openssl/rand.h>
 #include <openssl/trace.h>
 #endif
+#include "internal/usdt.h"

 #define COOKIE_STATE_FORMAT_VERSION 1

@@ -2129,6 +2130,9 @@ EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_FAIL;
     }

+    OSSL_USDT_new_context_with_data(s, "tls::key_exchange",
+        { "tls::group", OSSL_USDT_WORD(ginf->group_id) });
+
     if (!ginf->is_kem) {
         /* Regular KEX */
         skey = ssl_generate_pkey(s, ckey);
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 97b2971f2b..5c9eb45b4e 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -17,6 +17,7 @@
 #include "internal/cryptlib.h"
 #include "internal/ssl_unwrap.h"
 #include <openssl/rand.h>
+#include "internal/usdt.h"
 #include "../ssl_local.h"
 #include "statem_local.h"
 #include <assert.h>
@@ -391,6 +392,10 @@ static int state_machine(SSL_CONNECTION *s, int server)
     cb = get_callback(s);

     st->in_handshake++;
+
+    OSSL_USDT_new_context_with_data(s, "tls::handshake",
+        { "tls::role", OSSL_USDT_STRING(s->server ? "server" : "client") });
+
     if (!SSL_in_init(ssl) || SSL_in_before(ssl)) {
         /*
          * If we are stateless then we already called SSL_clear() - don't do
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index da3da65929..a80ede9a52 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -29,6 +29,7 @@
 #include "internal/comp.h"
 #include "internal/ssl_unwrap.h"
 #include <openssl/ocsp.h>
+#include "internal/usdt.h"

 static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL_CONNECTION *s,
     RAW_EXTENSION *extensions);
@@ -1906,6 +1907,8 @@ static int set_client_ciphersuite(SSL_CONNECTION *s,
     }
     s->s3.tmp.new_cipher = c;

+    OSSL_USDT_data(s, { "tls::ciphersuite", OSSL_USDT_WORD(SSL_CIPHER_get_protocol_id(c)) });
+
     return 1;
 }

@@ -2131,6 +2134,9 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
             /* SSLfatal() already called */
             goto err;
         }
+
+        OSSL_USDT_data(s,
+            { "tls::protocol_version", OSSL_USDT_WORD(s->version) });
     }

     if (SSL_CONNECTION_IS_VERSION13(s) || hrr) {
@@ -2728,6 +2734,9 @@ WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
      * set. The *documented* interface remains the same.
      */
     ERR_set_mark();
+
+    OSSL_USDT_new_context(s, "tls::verify_cert_chain");
+
     i = ssl_verify_cert_chain(s, s->session->peer_chain);
     if (i <= 0 && s->verify_mode != SSL_VERIFY_NONE) {
         ERR_clear_last_mark();
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index e951dc7901..123fb22ae5 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -23,6 +23,7 @@
 #include <openssl/x509.h>
 #include <openssl/trace.h>
 #include <openssl/encoder.h>
+#include "internal/usdt.h"

 /*
  * Map error codes to TLS/SSL alart types.
@@ -353,6 +354,9 @@ CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s, WPACKET *pkt)
         goto err;
     }

+    OSSL_USDT_new_context_with_data(s, "tls::sign",
+        { "tls::signature_algorithm", OSSL_USDT_WORD(lu->sigalg) });
+
     /*
      * To avoid problems with older RSA providers we must also pass the digest
      * name when passing any other parameters.
@@ -526,6 +530,9 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
     OSSL_TRACE1(TLS, "Using client verify alg %s\n",
         md == NULL ? "n/a" : EVP_MD_get0_name(md));

+    OSSL_USDT_new_context_with_data(s, "tls::verify",
+        { "tls::signature_algorithm", OSSL_USDT_WORD(s->s3.tmp.peer_sigalg->sigalg) });
+
     /*
      * To avoid problems with older RSA providers we must also pass the digest
      * name when passing any other parameters.
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index efda816487..bf88d586d2 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -33,6 +33,7 @@
 #include <openssl/comp.h>
 #include "internal/comp.h"
 #include <openssl/ocsp.h>
+#include "internal/usdt.h"

 #define TICKET_NONCE_SIZE 8

@@ -2378,6 +2379,8 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
         goto err;
     }

+    OSSL_USDT_data(s, { "tls::protocol_version", OSSL_USDT_WORD(s->version) });
+
     /* TLSv1.3 specifies that a ClientHello must end on a record boundary */
     if (SSL_CONNECTION_IS_VERSION13(s)
         && RECORD_LAYER_processed_read_pending(&s->rlayer)) {
@@ -2471,6 +2474,8 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
             goto err;
         }
         s->s3.tmp.new_cipher = cipher;
+
+        OSSL_USDT_data(s, { "tls::ciphersuite", OSSL_USDT_WORD(SSL_CIPHER_get_protocol_id(s->s3.tmp.new_cipher)) });
     }

     /* We need to do this before getting the session */
@@ -2995,6 +3000,8 @@ WORK_STATE tls_post_process_client_hello(SSL_CONNECTION *s, WORK_STATE wst)
                     goto err;
                 }
                 s->s3.tmp.new_cipher = cipher;
+
+                OSSL_USDT_data(s, { "tls::ciphersuite", OSSL_USDT_WORD(SSL_CIPHER_get_protocol_id(s->s3.tmp.new_cipher)) });
             }
             if (!s->hit) {
                 if (!tls_choose_sigalg(s, 1)) {
@@ -3014,6 +3021,8 @@ WORK_STATE tls_post_process_client_hello(SSL_CONNECTION *s, WORK_STATE wst)
         } else {
             /* Session-id reuse */
             s->s3.tmp.new_cipher = s->session->cipher;
+
+            OSSL_USDT_data(s, { "tls::ciphersuite", OSSL_USDT_WORD(SSL_CIPHER_get_protocol_id(s->s3.tmp.new_cipher)) });
         }

         /*
@@ -4644,6 +4653,9 @@ WORK_STATE tls_post_process_client_certificate(SSL_CONNECTION *s,
     } else {
         if (s->rwstate == SSL_RETRY_VERIFY)
             s->rwstate = SSL_NOTHING;
+
+        OSSL_USDT_new_context(s, "tls::verify_cert_chain");
+
         i = ssl_verify_cert_chain(s, sk);
         if (i > 0 && s->rwstate == SSL_RETRY_VERIFY) {
             /*