From 733be5b30b3e221de7c420445e9e5550515204ec Mon Sep 17 00:00:00 2001
From: Arthur Edelstein <arthuredelstein@gmail.com>
Date: Thu, 6 Apr 2017 17:09:09 -0700
Subject: [PATCH] Bug 21849: Don't allow SSL key logging

---
 security/nss/lib/ssl/Makefile | 2 +-
 security/nss/lib/ssl/ssl.gyp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/nss/lib/ssl/Makefile b/security/nss/lib/ssl/Makefile
index 24fccc5903fe7..de384f2854e79 100644
--- a/security/nss/lib/ssl/Makefile
+++ b/security/nss/lib/ssl/Makefile
@@ -41,7 +41,7 @@ endif
 
 # Enable key logging by default in debug builds, but not opt builds.
 # Logging still needs to be enabled at runtime through env vars.
-NSS_ALLOW_SSLKEYLOGFILE ?= $(if $(BUILD_OPT),0,1)
+NSS_ALLOW_SSLKEYLOGFILE ?= 0
 ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE))
 DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1
 endif
diff --git a/security/nss/lib/ssl/ssl.gyp b/security/nss/lib/ssl/ssl.gyp
index 3694ab91a5560..d5e71520967a7 100644
--- a/security/nss/lib/ssl/ssl.gyp
+++ b/security/nss/lib/ssl/ssl.gyp
@@ -88,7 +88,7 @@
   ],
   'target_defaults': {
     'defines': [
-      'NSS_ALLOW_SSLKEYLOGFILE=1'
+      'NSS_ALLOW_SSLKEYLOGFILE=0'
     ]
   },
   'variables': {
-- 
GitLab