diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-06 21:27:04 +0200 |
| commit | 4a71b30364a4b6d1eaf16fcfdc8e873e6697f293 (patch) | |
| tree | a47014077c14579249859ad34afcc5a8f2f0730a /security/nss/coreconf/config.mk | |
| parent | d7da72799521386c110dbba73b1e483b00a0a56a (diff) | |
| parent | 2dad0ec41d0b69c0a815012e6ea4bdde81b2875b (diff) | |
| download | UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.gz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.lz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.tar.xz UXP-4a71b30364a4b6d1eaf16fcfdc8e873e6697f293.zip | |
Merge branch 'NSS-335'
Diffstat (limited to 'security/nss/coreconf/config.mk')
| -rw-r--r-- | security/nss/coreconf/config.mk | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/security/nss/coreconf/config.mk b/security/nss/coreconf/config.mk index 09b733d5c..55d95c30e 100644 --- a/security/nss/coreconf/config.mk +++ b/security/nss/coreconf/config.mk @@ -146,10 +146,6 @@ endif # [16.0] Global environ ment defines ####################################################################### -ifdef NSS_DISABLE_ECC -DEFINES += -DNSS_DISABLE_ECC -endif - ifdef NSS_ALLOW_UNSUPPORTED_CRITICAL DEFINES += -DNSS_ALLOW_UNSUPPORTED_CRITICAL endif @@ -176,7 +172,7 @@ endif # FIPS support requires startup tests to be executed at load time of shared modules. # For performance reasons, these tests are disabled by default. -# When compiling binaries that must support FIPS mode, +# When compiling binaries that must support FIPS mode, # you should define NSS_FORCE_FIPS # # NSS_NO_INIT_SUPPORT is always defined on platforms that don't support @@ -203,8 +199,3 @@ DEFINES += -DNO_NSPR_10_SUPPORT # Hide old, deprecated, TLS cipher suite names when building NSS DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES - -# Mozilla's mozilla/modules/zlib/src/zconf.h adds the MOZ_Z_ prefix to zlib -# exported symbols, which causes problem when NSS is built as part of Mozilla. -# So we add a NSS_SSL_ENABLE_ZLIB variable to allow Mozilla to turn this off. -NSS_SSL_ENABLE_ZLIB = 1 |