From: Dr. Stephen Henson Date: Tue, 31 Jan 2017 18:01:55 +0000 (+0000) Subject: make errors X-Git-Tag: OpenSSL_1_1_1-pre1~2492 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e10dbdbfea000765f336dac3c5e7e41cf7b78c14;p=oweals%2Fopenssl.git make errors Reviewed-by: Rich Salz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/2339) --- diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 9d9e193a8c..aa3bcc6af0 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2283,8 +2283,8 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_CONSTRUCT_CTOS_KEY_SHARE 470 # define SSL_F_TLS_CONSTRUCT_CTOS_NPN 471 # define SSL_F_TLS_CONSTRUCT_CTOS_PADDING 472 -# define SSL_F_TLS_CONSTRUCT_CTOS_PSK_KEX_MODES 509 # define SSL_F_TLS_CONSTRUCT_CTOS_PSK 501 +# define SSL_F_TLS_CONSTRUCT_CTOS_PSK_KEX_MODES 509 # define SSL_F_TLS_CONSTRUCT_CTOS_RENEGOTIATE 473 # define SSL_F_TLS_CONSTRUCT_CTOS_SCT 474 # define SSL_F_TLS_CONSTRUCT_CTOS_SERVER_NAME 475 @@ -2505,6 +2505,7 @@ int ERR_load_SSL_strings(void); # define SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS 376 # define SSL_R_NO_SRTP_PROFILES 359 # define SSL_R_NO_SUITABLE_KEY_SHARE 101 +# define SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM 118 # define SSL_R_NO_VALID_SCTS 216 # define SSL_R_NO_VERIFY_COOKIE_CALLBACK 403 # define SSL_R_NULL_SSL_CTX 195 diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index 589cfa2e5f..a6d3412efa 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -607,6 +607,8 @@ static ERR_STRING_DATA SSL_str_reasons[] = { "no shared signature algorithms"}, {ERR_REASON(SSL_R_NO_SRTP_PROFILES), "no srtp profiles"}, {ERR_REASON(SSL_R_NO_SUITABLE_KEY_SHARE), "no suitable key share"}, + {ERR_REASON(SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM), + "no suitable signature algorithm"}, {ERR_REASON(SSL_R_NO_VALID_SCTS), "no valid scts"}, {ERR_REASON(SSL_R_NO_VERIFY_COOKIE_CALLBACK), "no verify cookie callback"},