From 9e70a5d378268a0c65eca71172a6ae90e8dae48b Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Sun, 25 May 2014 13:27:39 +0000 Subject: The ssl_ciper_get_evp() function is currently overloaded to also return the compression associated with the SSL session. Based on one of Adam Langley's chromium diffs, factor out the compression handling code into a separate ssl_cipher_get_comp() function. Rewrite the compression handling code to avoid pointless duplication and so that failures are actually returned to and detectable by the caller. ok miod@ --- lib/libssl/ssl_err.c | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/libssl/ssl_err.c') diff --git a/lib/libssl/ssl_err.c b/lib/libssl/ssl_err.c index 67ba3c76991..7bea7fafa1f 100644 --- a/lib/libssl/ssl_err.c +++ b/lib/libssl/ssl_err.c @@ -344,6 +344,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= { {ERR_REASON(SSL_R_CERT_LENGTH_MISMATCH) , "cert length mismatch"}, {ERR_REASON(SSL_R_CHALLENGE_IS_DIFFERENT), "challenge is different"}, {ERR_REASON(SSL_R_CIPHER_CODE_WRONG_LENGTH), "cipher code wrong length"}, + {ERR_REASON(SSL_R_CIPHER_COMPRESSION_UNAVAILABLE), "cipher compression unavailable"}, {ERR_REASON(SSL_R_CIPHER_OR_HASH_UNAVAILABLE), "cipher or hash unavailable"}, {ERR_REASON(SSL_R_CIPHER_TABLE_SRC_ERROR), "cipher table src error"}, {ERR_REASON(SSL_R_CLIENTHELLO_TLSEXT) , "clienthello tlsext"}, -- cgit v1.2.3