diff options
author | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-25 13:27:39 +0000 |
---|---|---|
committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-05-25 13:27:39 +0000 |
commit | 9e70a5d378268a0c65eca71172a6ae90e8dae48b (patch) | |
tree | 6fe8605af8341933252c68c179a6f6e5c53238a5 /lib/libssl/ssl_err.c | |
parent | e664b47ce4501f9ee04bb1f5f1e1c7522e8aa360 (diff) |
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@
Diffstat (limited to 'lib/libssl/ssl_err.c')
-rw-r--r-- | lib/libssl/ssl_err.c | 1 |
1 files changed, 1 insertions, 0 deletions
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"}, |