diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
| commit | f4a12fc67689a830e9da1c87fd11afe5bc09deb3 (patch) | |
| tree | 211ae0cd022a6c11b0026ecc7761a550c584583c /security/nss/lib/ssl/ssl.gyp | |
| parent | f7d30133221896638f7bf4f66c504255c4b14f48 (diff) | |
| download | UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.gz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.lz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.xz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.zip | |
Issue #1338 - Part 2: Update NSS to 3.48-RTM
Diffstat (limited to 'security/nss/lib/ssl/ssl.gyp')
| -rw-r--r-- | security/nss/lib/ssl/ssl.gyp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/security/nss/lib/ssl/ssl.gyp b/security/nss/lib/ssl/ssl.gyp index 2e28f6775..3e1b5531a 100644 --- a/security/nss/lib/ssl/ssl.gyp +++ b/security/nss/lib/ssl/ssl.gyp @@ -35,6 +35,7 @@ 'sslinit.c', 'sslmutex.c', 'sslnonce.c', + 'sslprimitive.c', 'sslreveal.c', 'sslsecur.c', 'sslsnce.c', @@ -48,6 +49,7 @@ 'tls13hashstate.c', 'tls13hkdf.c', 'tls13replay.c', + 'tls13subcerts.c', ], 'conditions': [ [ 'OS=="win"', { @@ -68,9 +70,9 @@ 'UNSAFE_FUZZER_MODE', ], }], - [ 'OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="linux"', { - 'cflags': [ - '-std=gnu99', + [ 'enable_sslkeylogfile==1', { + 'defines': [ + 'NSS_ALLOW_SSLKEYLOGFILE', ], }], ], @@ -92,11 +94,6 @@ } } ], - 'target_defaults': { - 'defines': [ - 'NSS_ALLOW_SSLKEYLOGFILE=1' - ] - }, 'variables': { 'module': 'nss' } |