diff options
| author | EKR <ekr@rtfm.com> | 2016-10-03 13:35:12 +0200 |
|---|---|---|
| committer | EKR <ekr@rtfm.com> | 2016-10-03 13:35:12 +0200 |
| commit | df295e66b781001f6f6c72c40083681a40496dac (patch) | |
| tree | ad6f138b8af06d0a428c43d241aead7c38091e85 | |
| parent | ad1236e125de3a97d280c5c5f72c3b7f55dcce22 (diff) | |
| download | nss-hg-df295e66b781001f6f6c72c40083681a40496dac.tar.gz | |
Bug 1306985 - Disable TLS 1.3 by default. r=mt. NSS 3.27.x Branch commit excluding the non-applicable changes (kaie).
| -rw-r--r-- | automation/taskcluster/graph/src/extend.js | 4 | ||||
| -rw-r--r-- | external_tests/ssl_gtest/Makefile | 4 | ||||
| -rw-r--r-- | lib/ssl/config.mk | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js index ef0fb5e57..8f58f1161 100644 --- a/automation/taskcluster/graph/src/extend.js +++ b/automation/taskcluster/graph/src/extend.js @@ -51,6 +51,10 @@ queue.map(task => { } } + // Enable TLS 1.3 for every task. + task.env = task.env || {}; + task.env.NSS_ENABLE_TLS_1_3 = "1"; + return task; }); diff --git a/external_tests/ssl_gtest/Makefile b/external_tests/ssl_gtest/Makefile index b396a1910..dfb8df943 100644 --- a/external_tests/ssl_gtest/Makefile +++ b/external_tests/ssl_gtest/Makefile @@ -33,6 +33,10 @@ ifdef NSS_SSL_ENABLE_ZLIB include $(CORE_DEPTH)/coreconf/zlib.mk endif +ifndef NSS_ENABLE_TLS_1_3 +NSS_DISABLE_TLS_1_3=1 +endif + ifdef NSS_DISABLE_TLS_1_3 # Run parameterized tests only, for which we can easily exclude TLS 1.3 CPPSRCS := $(filter-out $(shell grep -l '^TEST_F' $(CPPSRCS)), $(CPPSRCS)) diff --git a/lib/ssl/config.mk b/lib/ssl/config.mk index 7e2f9b3ee..c9a1eb3e6 100644 --- a/lib/ssl/config.mk +++ b/lib/ssl/config.mk @@ -72,6 +72,10 @@ DEFINES += -DNSS_SSL_ENABLE_ZLIB include $(CORE_DEPTH)/coreconf/zlib.mk endif +ifndef NSS_ENABLE_TLS_1_3 +NSS_DISABLE_TLS_1_3=1 +endif + ifdef NSS_DISABLE_TLS_1_3 DEFINES += -DNSS_DISABLE_TLS_1_3 endif |