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@

1 files changed, 1 insertions, 0 deletions

diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 9744d9783c..6765e3560a 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -2197,6 +2197,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_CERT_LENGTH_MISMATCH                       135
 #define SSL_R_CHALLENGE_IS_DIFFERENT                     136
 #define SSL_R_CIPHER_CODE_WRONG_LENGTH                   137
+#define SSL_R_CIPHER_COMPRESSION_UNAVAILABLE             371
 #define SSL_R_CIPHER_OR_HASH_UNAVAILABLE                 138
 #define SSL_R_CIPHER_TABLE_SRC_ERROR                     139
 #define SSL_R_CLIENTHELLO_TLSEXT                         226