commit 47fa36dc780f4962102205b390e18ce9ef74b1b9 Author: Arthur Edelstein arthuredelstein@gmail.com Date: Thu Apr 6 17:09:09 2017 -0700

Bug 21849: Don't allow SSL key logging --- config/external/nss/Makefile.in | 2 +- security/nss/lib/ssl/ssl.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 939529e..3f31d3b 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -241,7 +241,7 @@ DEFAULT_GMAKE_FLAGS += \ endif

DEFAULT_GMAKE_FLAGS += FREEBL_NO_DEPEND=0 $(FREEBL_LOWHASH_FLAG) -DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=1 +DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=0

ifdef MOZ_NO_WLZDEFS DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG= diff --git a/security/nss/lib/ssl/ssl.gyp b/security/nss/lib/ssl/ssl.gyp index 0306ab6..5c025d2 100644 --- a/security/nss/lib/ssl/ssl.gyp +++ b/security/nss/lib/ssl/ssl.gyp @@ -89,7 +89,7 @@ ], 'target_defaults': { 'defines': [ - 'NSS_ALLOW_SSLKEYLOGFILE=1' + 'NSS_ALLOW_SSLKEYLOGFILE=0' ] }, 'variables': {