From: Hugo Landau <hlandau@openssl.org>
Date: Wed, 24 Apr 2024 09:04:25 +0000 (+0100)
Subject: make update
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1289726c7172eb5ec3fd7dc8a6abf02af72918d4;p=thirdparty%2Fopenssl.git

make update

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24971)
---

diff --git a/doc/build.info b/doc/build.info
index edd1f301953..efdd76440a4 100644
--- a/doc/build.info
+++ b/doc/build.info
@@ -2715,6 +2715,10 @@ DEPEND[html/man3/SSL_new.html]=man3/SSL_new.pod
 GENERATE[html/man3/SSL_new.html]=man3/SSL_new.pod
 DEPEND[man/man3/SSL_new.3]=man3/SSL_new.pod
 GENERATE[man/man3/SSL_new.3]=man3/SSL_new.pod
+DEPEND[html/man3/SSL_new_domain.html]=man3/SSL_new_domain.pod
+GENERATE[html/man3/SSL_new_domain.html]=man3/SSL_new_domain.pod
+DEPEND[man/man3/SSL_new_domain.3]=man3/SSL_new_domain.pod
+GENERATE[man/man3/SSL_new_domain.3]=man3/SSL_new_domain.pod
 DEPEND[html/man3/SSL_new_listener.html]=man3/SSL_new_listener.pod
 GENERATE[html/man3/SSL_new_listener.html]=man3/SSL_new_listener.pod
 DEPEND[man/man3/SSL_new_listener.3]=man3/SSL_new_listener.pod
@@ -3694,6 +3698,7 @@ html/man3/SSL_key_update.html \
 html/man3/SSL_library_init.html \
 html/man3/SSL_load_client_CA_file.html \
 html/man3/SSL_new.html \
+html/man3/SSL_new_domain.html \
 html/man3/SSL_new_listener.html \
 html/man3/SSL_new_stream.html \
 html/man3/SSL_pending.html \
@@ -4360,6 +4365,7 @@ man/man3/SSL_key_update.3 \
 man/man3/SSL_library_init.3 \
 man/man3/SSL_load_client_CA_file.3 \
 man/man3/SSL_new.3 \
+man/man3/SSL_new_domain.3 \
 man/man3/SSL_new_listener.3 \
 man/man3/SSL_new_stream.3 \
 man/man3/SSL_pending.3 \
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index cf6b42436af..89897cf70d8 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -147,6 +147,7 @@ static const ERR_STRING_DATA SSL_str_reasons[] = {
     "dh public value length is wrong"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DIGEST_CHECK_FAILED),
     "digest check failed"},
+    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DOMAIN_USE_ONLY), "domain use only"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DTLS_MESSAGE_TOO_BIG),
     "dtls message too big"},
     {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DUPLICATE_COMPRESSION_ID),
diff --git a/util/libssl.num b/util/libssl.num
index bf13402d08f..a121ed820b1 100644
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -595,3 +595,10 @@ SSL_accept_connection                   ?	3_5_0	EXIST::FUNCTION:
 SSL_get_accept_connection_queue_len     ?	3_5_0	EXIST::FUNCTION:
 SSL_listen                              ?	3_5_0	EXIST::FUNCTION:
 SSL_new_from_listener                   ?	3_5_0	EXIST::FUNCTION:
+SSL_new_listener_from                   ?	3_5_0	EXIST::FUNCTION:
+SSL_is_domain                           ?	3_5_0	EXIST::FUNCTION:
+SSL_get0_domain                         ?	3_5_0	EXIST::FUNCTION:
+SSL_new_domain                          ?	3_5_0	EXIST::FUNCTION:
+SSL_CTX_set_domain_flags                ?	3_5_0	EXIST::FUNCTION:
+SSL_CTX_get_domain_flags                ?	3_5_0	EXIST::FUNCTION:
+SSL_get_domain_flags                    ?	3_5_0	EXIST::FUNCTION:
diff --git a/util/other.syms b/util/other.syms
index 148a269e9ce..eab18fedf71 100644
--- a/util/other.syms
+++ b/util/other.syms
@@ -600,6 +600,11 @@ SSL_CTX_set_tlsext_ticket_key_cb        define
 SSL_CTX_set_tmp_dh                      define
 SSL_CTX_set_tmp_ecdh                    define
 SSL_DEFAULT_CIPHER_LIST                 define deprecated 3.0.0
+SSL_DOMAIN_FLAG_SINGLE_THREAD           define
+SSL_DOMAIN_FLAG_MULTI_THREAD            define
+SSL_DOMAIN_FLAG_THREAD_ASSISTED         define
+SSL_DOMAIN_FLAG_BLOCKING                define
+SSL_DOMAIN_FLAG_LEGACY_BLOCKING         define
 SSL_OP_BIT                              define
 SSL_add0_chain_cert                     define
 SSL_add1_chain_cert                     define