From 9f2a142b13a8fc37b811bc590baf847cc6be7ab3 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Mon, 4 Apr 2016 16:11:04 -0400 Subject: [PATCH] Revert "Fix an error code spelling." This reverts commit 2b0bcfaf834e2fb7cd52888d7330b247e3878115. It wasn't reviewed. Reviewed-by: Rich Salz --- include/openssl/ssl.h | 2 +- ssl/ssl_err.c | 2 +- ssl/statem/statem_srvr.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 1aa669c039..ea47cb3da3 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2481,7 +2481,7 @@ void ERR_load_SSL_strings(void); # define SSL_R_RENEGOTIATION_ENCODING_ERR 336 # define SSL_R_RENEGOTIATION_MISMATCH 337 # define SSL_R_REQUIRED_CIPHER_MISSING 215 -# define SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING 342 +# define SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING 342 # define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING 345 # define SSL_R_SCT_VERIFICATION_FAILED 208 # define SSL_R_SERVERHELLO_TLSEXT 275 diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index e42849e592..8e00743e64 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -587,7 +587,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = { "renegotiation encoding err"}, {ERR_REASON(SSL_R_RENEGOTIATION_MISMATCH), "renegotiation mismatch"}, {ERR_REASON(SSL_R_REQUIRED_CIPHER_MISSING), "required cipher missing"}, - {ERR_REASON(SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING), + {ERR_REASON(SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING), "required compression algorithm missing"}, {ERR_REASON(SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING), "scsv received when renegotiating"}, diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 8fdf6e6019..23e790356c 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -1376,7 +1376,7 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL *s, PACKET *pkt) if (k >= complen) { al = SSL_AD_ILLEGAL_PARAMETER; SSLerr(SSL_F_TLS_PROCESS_CLIENT_HELLO, - SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING); + SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING); goto f_err; } } else if (s->hit)