diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
| commit | aff03b0a67c41cf7af5df9c9eef715a8b27a2667 (patch) | |
| tree | aa2909ae4718f81c83c8cfb68c1f5a23485b3173 /security/nss/lib/ssl/ssl.gyp | |
| parent | bdb4ff581677ad1cd411b55a68c87534f9a64882 (diff) | |
| parent | 11caf6ecb3cb8c84d2355a6c6e9580a290147e92 (diff) | |
| download | UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.gz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.lz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.xz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_dom_performance-resource-timing_1
Diffstat (limited to 'security/nss/lib/ssl/ssl.gyp')
| -rw-r--r-- | security/nss/lib/ssl/ssl.gyp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/security/nss/lib/ssl/ssl.gyp b/security/nss/lib/ssl/ssl.gyp index 3694ab91a..03b2d6014 100644 --- a/security/nss/lib/ssl/ssl.gyp +++ b/security/nss/lib/ssl/ssl.gyp @@ -13,20 +13,18 @@ 'authcert.c', 'cmpcert.c', 'dtlscon.c', - 'dtls13con.c', 'prelib.c', 'selfencrypt.c', 'ssl3con.c', 'ssl3ecc.c', + 'ssl3encode.c', 'ssl3ext.c', 'ssl3exthandle.c', 'ssl3gthr.c', 'sslauth.c', - 'sslbloom.c', 'sslcert.c', 'sslcon.c', 'ssldef.c', - 'sslencode.c', 'sslenum.c', 'sslerr.c', 'sslerrstrs.c', @@ -39,14 +37,11 @@ 'sslsecur.c', 'sslsnce.c', 'sslsock.c', - 'sslspec.c', 'ssltrace.c', 'sslver.c', 'tls13con.c', 'tls13exthandle.c', - 'tls13hashstate.c', 'tls13hkdf.c', - 'tls13replay.c', ], 'conditions': [ [ 'OS=="win"', { @@ -62,6 +57,14 @@ 'unix_err.c' ], }], + [ 'ssl_enable_zlib==1', { + 'dependencies': [ + '<(DEPTH)/lib/zlib/zlib.gyp:nss_zlib' + ], + 'defines': [ + 'NSS_SSL_ENABLE_ZLIB', + ], + }], [ 'fuzz_tls==1', { 'defines': [ 'UNSAFE_FUZZER_MODE', |