[PATCH 2 of 2] SSL: $ssl_encrypted_hello variable

[Maxim Dounin]

# HG changeset patch
# User Maxim Dounin <mdounin at mdounin.ru>
# Date 1757416233 -10800
#      Tue Sep 09 14:10:33 2025 +0300
# Node ID 223d802d990cf5b32517fca34da299b243f37086
# Parent  c28c012ef2a0448356ed0d8428bb373555689c8c
SSL: $ssl_encrypted_hello variable.

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -5835,6 +5835,48 @@ ngx_ssl_get_early_data(ngx_connection_t 
 
 
 ngx_int_t
+ngx_ssl_get_encrypted_hello(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
+{
+    s->len = 0;
+
+#ifdef OSSL_ECH_FOR_RETRY
+    {
+    char  *outer, *inner;
+
+    /* OpenSSL */
+
+    outer = NULL;
+    inner = NULL;
+
+    if (SSL_ech_get1_status(c->ssl->connection, &outer, &inner)
+        == SSL_ECH_STATUS_SUCCESS)
+    {
+        ngx_str_set(s, "1");
+    }
+
+    if (outer) {
+        OPENSSL_free(outer);
+    }
+
+    if (inner) {
+        OPENSSL_free(inner);
+    }
+    }
+#elif defined SSL_R_UNSUPPORTED_ECH_SERVER_CONFIG
+
+    /* BoringSSL */
+
+    if (SSL_ech_accepted(c->ssl->connection)) {
+        ngx_str_set(s, "1");
+    }
+
+#endif
+
+    return NGX_OK;
+}
+
+
+ngx_int_t
 ngx_ssl_get_server_name(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
 {
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -289,6 +289,8 @@ ngx_int_t ngx_ssl_get_session_reused(ngx
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_early_data(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
+ngx_int_t ngx_ssl_get_encrypted_hello(ngx_connection_t *c, ngx_pool_t *pool,
+    ngx_str_t *s);
 ngx_int_t ngx_ssl_get_server_name(ngx_connection_t *c, ngx_pool_t *pool,
     ngx_str_t *s);
 ngx_int_t ngx_ssl_get_alpn_protocol(ngx_connection_t *c, ngx_pool_t *pool,
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@ -359,6 +359,9 @@ static ngx_http_variable_t  ngx_http_ssl
       (uintptr_t) ngx_ssl_get_early_data,
       NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
+    { ngx_string("ssl_encrypted_hello"), NULL, ngx_http_ssl_variable,
+      (uintptr_t) ngx_ssl_get_encrypted_hello, NGX_HTTP_VAR_CHANGEABLE, 0 },
+
     { ngx_string("ssl_server_name"), NULL, ngx_http_ssl_variable,
       (uintptr_t) ngx_ssl_get_server_name, NGX_HTTP_VAR_CHANGEABLE, 0 },