diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-06-06 16:59:11 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-07-17 08:18:05 +1000 |
| commit | bac3f4da5579887d6e203020e83298676cc982ba (patch) | |
| tree | 3fceacbf534c9b28ee4b339bcca60529bc806736 | |
| parent | 5ed3a435d5f84e296330595985c7adb2575ecba5 (diff) | |
| download | openssl-bac3f4da5579887d6e203020e83298676cc982ba.tar.gz | |
make update
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21135)
| -rw-r--r-- | crypto/err/openssl.txt | 4 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 8 | ||||
| -rw-r--r-- | ssl/ssl_err.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index df8b73ba2d..cbb3296942 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1558,6 +1558,10 @@ SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH:303:ssl session id has bad length SSL_R_SSL_SESSION_ID_TOO_LONG:408:ssl session id too long SSL_R_SSL_SESSION_VERSION_MISMATCH:210:ssl session version mismatch SSL_R_STILL_IN_INIT:121:still in init +SSL_R_STREAM_FINISHED:365:stream finished +SSL_R_STREAM_RECV_ONLY:366:stream recv only +SSL_R_STREAM_RESET:375:stream reset +SSL_R_STREAM_SEND_ONLY:379:stream send only SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED:1116:tlsv13 alert certificate required SSL_R_TLSV13_ALERT_MISSING_EXTENSION:1109:tlsv13 alert missing extension SSL_R_TLSV1_ALERT_ACCESS_DENIED:1049:tlsv1 alert access denied diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 81e3fd8c21..b46883e7db 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -286,6 +286,10 @@ # define SSL_R_SSL_SESSION_ID_TOO_LONG 408 # define SSL_R_SSL_SESSION_VERSION_MISMATCH 210 # define SSL_R_STILL_IN_INIT 121 +# define SSL_R_STREAM_FINISHED 365 +# define SSL_R_STREAM_RECV_ONLY 366 +# define SSL_R_STREAM_RESET 375 +# define SSL_R_STREAM_SEND_ONLY 379 # define SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED 1116 # define SSL_R_TLSV13_ALERT_MISSING_EXTENSION 1109 # define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049 @@ -355,9 +359,5 @@ # define SSL_R_WRONG_VERSION_NUMBER 267 # define SSL_R_X509_LIB 268 # define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269 -# define SSL_R_STREAM_RECV_ONLY 382 -# define SSL_R_STREAM_SEND_ONLY 387 -# define SSL_R_STREAM_RESET 393 -# define SSL_R_STREAM_FINISHED 395 #endif diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index e2e2b65e0d..403ef59bc1 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -459,6 +459,10 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_VERSION_MISMATCH), "ssl session version mismatch"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STILL_IN_INIT), "still in init"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_FINISHED), "stream finished"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RECV_ONLY), "stream recv only"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RESET), "stream reset"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_SEND_ONLY), "stream send only"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED), "tlsv13 alert certificate required"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_MISSING_EXTENSION), |