mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build break when OPENSSL_NO_SSLKEYLOGFILE is not defined

Browse Source 
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)
This commit is contained in:
Neil Horman 2024-10-03 11:41:46 -04:00 committed by Matt Caswell
parent 3992add1b7
commit a2b5e64907
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/ssl_lib.c
View File

@ -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;
}