From: Neil Horman <nhorman@openssl.org>
Date: Thu, 3 Oct 2024 15:41:46 +0000 (-0400)
Subject: Fix build break when OPENSSL_NO_SSLKEYLOGFILE is not defined
X-Git-Tag: openssl-3.5.0-alpha1~992
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2b5e64907a87d603ff649eccd7fdf151e34e4ba;p=thirdparty%2Fopenssl.git

Fix build break when OPENSSL_NO_SSLKEYLOGFILE is not defined

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Hugo Landau <hlandau@devever.net>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25297)
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 27150db61c8..2087331f586 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3893,12 +3893,11 @@ static long check_keylog_bio_free(BIO *b, int oper, const char *argp,
     /*
      * Note we _dont_ take the keylog_lock here
      * This is intentional, because we only free the keylog lock
-     * During SSL_CTX_free, in which we already posess the lock, so 
+     * During SSL_CTX_free, in which we already posess the lock, so
      * Theres no need to grab it again here
      */
     if (oper == BIO_CB_FREE)
         keylog_bio = NULL;
-out:
     return ret;
 }
 
@@ -4235,7 +4234,9 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
     return ret;
  err:
     SSL_CTX_free(ret);
+#ifndef OPENSSL_NO_SSLKEYLOG
     BIO_free(keylog_bio);
+#endif
     return NULL;
 }