summaryrefslogtreecommitdiff
path: root/ssl/ssl_err.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-01-01 00:44:36 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-01-01 00:44:36 +0000
commite642fd7a1c0f506deccab37ae37f59737d4ee6f9 (patch)
treefab25feaeaefc1a0c48e2a77625d8821b9626b83 /ssl/ssl_err.c
parent5448e6739cc628f1f920bd1f2515d8ee69004ea0 (diff)
downloadopenssl-new-e642fd7a1c0f506deccab37ae37f59737d4ee6f9.tar.gz
Compression handling on session resume was badly broken: it always
used compression algorithms in client hello (a legacy from when the compression algorithm wasn't serialized with SSL_SESSION).
Diffstat (limited to 'ssl/ssl_err.c')
-rw-r--r--ssl/ssl_err.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index f47e4a5099..44f2f6bbc3 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -357,8 +357,10 @@ static ERR_STRING_DATA SSL_str_reasons[]=
{ERR_REASON(SSL_R_HTTPS_PROXY_REQUEST) ,"https proxy request"},
{ERR_REASON(SSL_R_HTTP_REQUEST) ,"http request"},
{ERR_REASON(SSL_R_ILLEGAL_PADDING) ,"illegal padding"},
+{ERR_REASON(SSL_R_INCONSISTENT_COMPRESSION),"inconsistent compression"},
{ERR_REASON(SSL_R_INVALID_CHALLENGE_LENGTH),"invalid challenge length"},
{ERR_REASON(SSL_R_INVALID_COMMAND) ,"invalid command"},
+{ERR_REASON(SSL_R_INVALID_COMPRESSION_ALGORITHM),"invalid compression algorithm"},
{ERR_REASON(SSL_R_INVALID_PURPOSE) ,"invalid purpose"},
{ERR_REASON(SSL_R_INVALID_STATUS_RESPONSE),"invalid status response"},
{ERR_REASON(SSL_R_INVALID_TICKET_KEYS_LENGTH),"invalid ticket keys length"},
@@ -451,6 +453,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
{ERR_REASON(SSL_R_RENEGOTIATION_ENCODING_ERR),"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_COMPRESSSION_ALGORITHM_MISSING),"required compresssion algorithm missing"},
{ERR_REASON(SSL_R_REUSE_CERT_LENGTH_NOT_ZERO),"reuse cert length not zero"},
{ERR_REASON(SSL_R_REUSE_CERT_TYPE_NOT_ZERO),"reuse cert type not zero"},
{ERR_REASON(SSL_R_REUSE_CIPHER_LIST_NOT_ZERO),"reuse cipher list not zero"},