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, 3 insertions, 1 deletions

diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index 01dd846596..734e0c0755 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -190,7 +190,9 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
         if (x->compress_meth != 0) {
                 SSL_COMP *comp = NULL;
 
-                ssl_cipher_get_evp(x, NULL, NULL, NULL, NULL, &comp);
+                if (!ssl_cipher_get_comp(x, &comp))
+                        goto err;
+
                 if (comp == NULL) {
                         if (BIO_printf(bp, "\n    Compression: %d", x->compress_meth) <= 0)
                                 goto err;