diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/global.c | 5 | ||||
| -rw-r--r-- | lib/global.h | 2 | ||||
| -rw-r--r-- | lib/kx.c | 11 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/global.c b/lib/global.c index ef05efaba1..535bb19896 100644 --- a/lib/global.c +++ b/lib/global.c @@ -71,7 +71,6 @@ extern const ASN1_ARRAY_TYPE gnutls_asn1_tab[]; extern const ASN1_ARRAY_TYPE pkix_asn1_tab[]; void *_gnutls_file_mutex; void *_gnutls_pkcs11_mutex; -const char *_gnutls_keylogfile = NULL; ASN1_TYPE _gnutls_pkix1_asn = ASN1_TYPE_EMPTY; ASN1_TYPE _gnutls_gnutls_asn = ASN1_TYPE_EMPTY; @@ -242,10 +241,6 @@ int gnutls_global_init(void) _gnutls_switch_lib_state(LIB_STATE_INIT); - _gnutls_keylogfile = secure_getenv("GNUTLS_KEYLOGFILE"); - if (_gnutls_keylogfile == NULL) - _gnutls_keylogfile = secure_getenv("SSLKEYLOGFILE"); - e = secure_getenv("GNUTLS_DEBUG_LEVEL"); if (e != NULL) { level = atoi(e); diff --git a/lib/global.h b/lib/global.h index 8efa3b417b..45d8dcaff8 100644 --- a/lib/global.h +++ b/lib/global.h @@ -38,8 +38,6 @@ extern ASN1_TYPE _gnutls_gnutls_asn; #define _gnutls_get_gnutls_asn() ((ASN1_TYPE) _gnutls_gnutls_asn) #define _gnutls_get_pkix() ((ASN1_TYPE) _gnutls_pkix1_asn) -extern const char *_gnutls_keylogfile; - extern gnutls_log_func _gnutls_log_func; extern gnutls_audit_log_func _gnutls_audit_log_func; extern int _gnutls_log_level; @@ -100,11 +100,18 @@ static void write_nss_key_log(gnutls_session_t session, const gnutls_datum_t *pr char buf[512]; char buf2[512]; FILE *fp; + static const char *keylogfile = NULL; + static unsigned checked_env = 0; - if (_gnutls_keylogfile == NULL) + if (!checked_env) { + checked_env = 1; + keylogfile = secure_getenv("SSLKEYLOGFILE"); + } + + if (keylogfile == NULL) return; - fp = fopen(_gnutls_keylogfile, "a"); + fp = fopen(keylogfile, "a"); if (fp == NULL) return; |