keylogfile: only consider the SSLKEYLOGFILE variable

In addition do not check the environment in the constructor
but instead use static variables to save the key file name.
The GNUTLS_KEYLOGFILE environment variable is no longer used
since there is no reason to have a separate one.

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/kx.c b/lib/kx.c
index 87a93f6906..4e0a50bd74 100644
--- a/lib/kx.c
+++ b/lib/kx.c
@@ -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;