diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2016-11-25 10:49:53 +1100 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2016-11-25 10:49:53 +1100 |
| commit | 0596d3b0ba69feb3e1f197dd35441021972f6d37 (patch) | |
| tree | ac1a8e547a1de2c180594e2779984ba0645f6391 | |
| parent | 85926c394288b5ee0330b4769dd28d3bd0a7f868 (diff) | |
| download | nss-hg-0596d3b0ba69feb3e1f197dd35441021972f6d37.tar.gz | |
Bug 1311296 - Build TLS 1.3 by default, r=kaie
| -rw-r--r-- | automation/taskcluster/graph/src/extend.js | 4 | ||||
| -rw-r--r-- | gtests/ssl_gtest/Makefile | 5 | ||||
| -rw-r--r-- | lib/ssl/config.mk | 4 | ||||
| -rw-r--r-- | readme.md | 1 |
4 files changed, 1 insertions, 13 deletions
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js index a6a8fcbe2..24d99f03d 100644 --- a/automation/taskcluster/graph/src/extend.js +++ b/automation/taskcluster/graph/src/extend.js @@ -70,10 +70,6 @@ queue.map(task => { task.maxRunTime = 7200; } - // Enable TLS 1.3 for every task. - task.env = task.env || {}; - task.env.NSS_ENABLE_TLS_1_3 = "1"; - return task; }); diff --git a/gtests/ssl_gtest/Makefile b/gtests/ssl_gtest/Makefile index dfb8df943..a9a9290e0 100644 --- a/gtests/ssl_gtest/Makefile +++ b/gtests/ssl_gtest/Makefile @@ -33,11 +33,8 @@ 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 +NSS_DISABLE_TLS_1_3=1 # Run parameterized tests only, for which we can easily exclude TLS 1.3 CPPSRCS := $(filter-out $(shell grep -l '^TEST_F' $(CPPSRCS)), $(CPPSRCS)) CFLAGS += -DNSS_DISABLE_TLS_1_3 diff --git a/lib/ssl/config.mk b/lib/ssl/config.mk index 339cc80df..c8b053cab 100644 --- a/lib/ssl/config.mk +++ b/lib/ssl/config.mk @@ -62,10 +62,6 @@ 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 @@ -49,7 +49,6 @@ After changing into the NSS directory a typical build of 32-bit NSS is done as f The following environment variables might be useful: * `BUILD_OPT=1` to get an optimised build * `USE_64=1` to get a 64-bit build (recommended) -* `NSS_ENABLE_TLS_1_3=1` to enable TLS 1.3 support The complete list of environment variables can be found [here](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSS_environment_variables). |