When you have functions that perform specific functions, use them.

EVP_CIPHER_CTX_free() does a NULL check, then calls EVP_CIPHER_CTX_cleanup()
and frees the memory. COMP_CTX_free() also had its own NULL check, so there
is no point in duplicating that here.

ok beck@

2 files changed, 18 insertions, 36 deletions

diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index 12d45ea025..f1c92ee2f6 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -2726,25 +2726,16 @@ SSL_dup(SSL *s)
 void
 ssl_clear_cipher_ctx(SSL *s)
 {
-        if (s->enc_read_ctx != NULL) {
-                EVP_CIPHER_CTX_cleanup(s->enc_read_ctx);
-                free(s->enc_read_ctx);
-                s->enc_read_ctx = NULL;
-        }
-        if (s->enc_write_ctx != NULL) {
-                EVP_CIPHER_CTX_cleanup(s->enc_write_ctx);
-                free(s->enc_write_ctx);
-                s->enc_write_ctx = NULL;
-        }
+        EVP_CIPHER_CTX_free(s->enc_read_ctx);
+        s->enc_read_ctx = NULL;
+        EVP_CIPHER_CTX_free(s->enc_write_ctx);
+        s->enc_write_ctx = NULL;
+
 #ifndef OPENSSL_NO_COMP
-        if (s->expand != NULL) {
-                COMP_CTX_free(s->expand);
-                s->expand = NULL;
-        }
-        if (s->compress != NULL) {
-                COMP_CTX_free(s->compress);
-                s->compress = NULL;
-        }
+        COMP_CTX_free(s->expand);
+        s->expand = NULL;
+        COMP_CTX_free(s->compress);
+        s->compress = NULL;
 #endif
 }
 
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 12d45ea025..f1c92ee2f6 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -2726,25 +2726,16 @@ SSL_dup(SSL *s)
 void
 ssl_clear_cipher_ctx(SSL *s)
 {
-        if (s->enc_read_ctx != NULL) {
-                EVP_CIPHER_CTX_cleanup(s->enc_read_ctx);
-                free(s->enc_read_ctx);
-                s->enc_read_ctx = NULL;
-        }
-        if (s->enc_write_ctx != NULL) {
-                EVP_CIPHER_CTX_cleanup(s->enc_write_ctx);
-                free(s->enc_write_ctx);
-                s->enc_write_ctx = NULL;
-        }
+        EVP_CIPHER_CTX_free(s->enc_read_ctx);
+        s->enc_read_ctx = NULL;
+        EVP_CIPHER_CTX_free(s->enc_write_ctx);
+        s->enc_write_ctx = NULL;
+
 #ifndef OPENSSL_NO_COMP
-        if (s->expand != NULL) {
-                COMP_CTX_free(s->expand);
-                s->expand = NULL;
-        }
-        if (s->compress != NULL) {
-                COMP_CTX_free(s->compress);
-                s->compress = NULL;
-        }
+        COMP_CTX_free(s->expand);
+        s->expand = NULL;
+        COMP_CTX_free(s->compress);
+        s->compress = NULL;
 #endif
 }