make update

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23495)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 74e44088d09e22a96e07eff251592bcd18639d15..502f05d1f1976c6e64c6983de0b3008dd7299133 100644 (file)
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -1507,7 +1507,7 @@ SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE:199:peer did not return a certificate
 SSL_R_PEM_NAME_BAD_PREFIX:391:pem name bad prefix
 SSL_R_PEM_NAME_TOO_SHORT:392:pem name too short
 SSL_R_PIPELINE_FAILURE:406:pipeline failure
-SSL_R_POLL_REQUEST_NOT_SUPPORTED:413:poll request not supported
+SSL_R_POLL_REQUEST_NOT_SUPPORTED:418:poll request not supported
 SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR:278:post handshake auth encoding err
 SSL_R_PRIVATE_KEY_MISMATCH:288:private key mismatch
 SSL_R_PROTOCOL_IS_SHUTDOWN:207:protocol is shutdown

diff --git a/doc/build.info b/doc/build.info
index a5f004107aefc40ffffb25a8c48149eb751dcef4..b4815fcf23a7957e502cc4cb769ca894175743ce 100644 (file)
--- a/doc/build.info
+++ b/doc/build.info
@@ -2667,6 +2667,10 @@ DEPEND[html/man3/SSL_pending.html]=man3/SSL_pending.pod
 GENERATE[html/man3/SSL_pending.html]=man3/SSL_pending.pod
 DEPEND[man/man3/SSL_pending.3]=man3/SSL_pending.pod
 GENERATE[man/man3/SSL_pending.3]=man3/SSL_pending.pod
+DEPEND[html/man3/SSL_poll.html]=man3/SSL_poll.pod
+GENERATE[html/man3/SSL_poll.html]=man3/SSL_poll.pod
+DEPEND[man/man3/SSL_poll.3]=man3/SSL_poll.pod
+GENERATE[man/man3/SSL_poll.3]=man3/SSL_poll.pod
 DEPEND[html/man3/SSL_read.html]=man3/SSL_read.pod
 GENERATE[html/man3/SSL_read.html]=man3/SSL_read.pod
 DEPEND[man/man3/SSL_read.3]=man3/SSL_read.pod
@@ -3594,6 +3598,7 @@ html/man3/SSL_load_client_CA_file.html \
 html/man3/SSL_new.html \
 html/man3/SSL_new_stream.html \
 html/man3/SSL_pending.html \
+html/man3/SSL_poll.html \
 html/man3/SSL_read.html \
 html/man3/SSL_read_early_data.html \
 html/man3/SSL_rstate_string.html \
@@ -4238,6 +4243,7 @@ man/man3/SSL_load_client_CA_file.3 \
 man/man3/SSL_new.3 \
 man/man3/SSL_new_stream.3 \
 man/man3/SSL_pending.3 \
+man/man3/SSL_poll.3 \
 man/man3/SSL_read.3 \
 man/man3/SSL_read_early_data.3 \
 man/man3/SSL_rstate_string.3 \

diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index 505bafacb2ad5582e9d2be6bc63adc08ffa5a9ba..980a6c7b2fd4fa2b470cb6598c43ef96f582a838 100644 (file)
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -227,7 +227,7 @@
 # define SSL_R_PEM_NAME_BAD_PREFIX                        391
 # define SSL_R_PEM_NAME_TOO_SHORT                         392
 # define SSL_R_PIPELINE_FAILURE                           406
-# define SSL_R_POLL_REQUEST_NOT_SUPPORTED                 413
+# define SSL_R_POLL_REQUEST_NOT_SUPPORTED                 418
 # define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR           278
 # define SSL_R_PRIVATE_KEY_MISMATCH                       288
 # define SSL_R_PROTOCOL_IS_SHUTDOWN                       207