diff options
| author | Hugo Landau <hlandau@openssl.org> | 2024-02-02 12:26:00 +0000 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2024-02-10 11:37:14 +0000 |
| commit | f945986a180d0af7cc3029ffbae0c826f06e5c9d (patch) | |
| tree | 5a94403e99922d1f1c8ebe36bd813ee8e56cfeda | |
| parent | c9b0df2250e20620870eaf3b9cf998947a1bf526 (diff) | |
| download | openssl-f945986a180d0af7cc3029ffbae0c826f06e5c9d.tar.gz | |
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)
| -rw-r--r-- | crypto/err/openssl.txt | 2 | ||||
| -rw-r--r-- | doc/build.info | 6 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 74e44088d0..502f05d1f1 100644 --- 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 a5f004107a..b4815fcf23 100644 --- 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 505bafacb2..980a6c7b2f 100644 --- 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 |