Bug 1283604 - Enable TLS 1.3 by default, add NSS_DISABLE_TLS_1_3 opti…

…on, r=kaie,ttaubert --HG-- extra : rebase_source : c1814209ae066fd19f01cd7e17b98ffe3258e7f0 extra : amend_source : 0ef848c43dc95914ba8bd85d560b3559e9f74469
sailfishos-mirror · Jun 30, 2016 · ce17b4d · ce17b4d
1 parent fa14ce9
commit ce17b4d
Show file tree

Hide file tree

Showing 24 changed files with 209 additions and 343 deletions.
diff --git a/automation/taskcluster/graph/linux/build32-debug.yml b/automation/taskcluster/graph/linux/build32-debug.yml
@@ -4,10 +4,6 @@
       name: "Linux 32 (debug)"
       description: "Linux 32 (debug)"
 
-    payload:
-      env:
-        NSS_ENABLE_TLS_1_3: 1
-
     extra:
       treeherder:
         build:
@@ -32,31 +28,13 @@
     - ssl
     - tools
 
-- task:
-    metadata:
-      name: "Linux 32 (debug, no TLS 1.3)"
-      description: "Linux 32 (debug, no TLS 1.3)"
-
-    extra:
-      treeherder:
-        build:
-          platform: linux32
-        machine:
-          platform: linux32
-        collection:
-          debug: true
-        groupSymbol: Builds
-        groupName: Various builds
-        symbol: noTLSv1.3
-
 - task:
     metadata:
       name: "Linux 32 (debug, clang-3.8)"
       description: "Linux 32 (debug, clang-3.8)"
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: clang
         GXX_VERSION: clang++
 
@@ -79,7 +57,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-4.8
         GXX_VERSION: g++-4.8
 
@@ -102,7 +79,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-6
         GXX_VERSION: g++-6
 
@@ -126,7 +102,6 @@
     payload:
       env:
         NSS_NO_PKCS11_BYPASS: 1
-        NSS_ENABLE_TLS_1_3: 1
 
     extra:
       treeherder:

diff --git a/automation/taskcluster/graph/linux/build32-opt.yml b/automation/taskcluster/graph/linux/build32-opt.yml
@@ -6,7 +6,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         BUILD_OPT: 1
 
     extra:
@@ -33,35 +32,13 @@
     - ssl
     - tools
 
-- task:
-    metadata:
-      name: "Linux 32 (opt, no TLS 1.3)"
-      description: "Linux 32 (opt, no TLS 1.3)"
-
-    payload:
-      env:
-        BUILD_OPT: 1
-
-    extra:
-      treeherder:
-        build:
-          platform: linux32
-        machine:
-          platform: linux32
-        collection:
-          opt: true
-        groupSymbol: Builds
-        groupName: Various builds
-        symbol: noTLSv1.3
-
 - task:
     metadata:
       name: "Linux 32 (opt, clang-3.8)"
       description: "Linux 32 (opt, clang-3.8)"
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: clang
         GXX_VERSION: clang++
         BUILD_OPT: 1
@@ -85,7 +62,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-4.8
         GXX_VERSION: g++-4.8
         BUILD_OPT: 1
@@ -109,7 +85,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-6
         GXX_VERSION: g++-6
         BUILD_OPT: 1
@@ -134,7 +109,6 @@
     payload:
       env:
         NSS_NO_PKCS11_BYPASS: 1
-        NSS_ENABLE_TLS_1_3: 1
         BUILD_OPT: 1
 
     extra:

diff --git a/automation/taskcluster/graph/linux/build64-asan.yml b/automation/taskcluster/graph/linux/build64-asan.yml
@@ -10,7 +10,6 @@
         GXX_VERSION: clang++
         NSS_DISABLE_ARENA_FREE_LIST: 1
         NSS_DISABLE_UNLOAD: 1
-        NSS_ENABLE_TLS_1_3: 1
         USE_ASAN: 1
         USE_64: 1
 

diff --git a/automation/taskcluster/graph/linux/build64-debug.yml b/automation/taskcluster/graph/linux/build64-debug.yml
@@ -6,7 +6,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         USE_64: 1
 
     extra:
@@ -33,35 +32,13 @@
     - ssl
     - tools
 
-- task:
-    metadata:
-      name: "Linux 64 (debug, no TLS 1.3)"
-      description: "Linux 64 (debug, no TLS 1.3)"
-
-    payload:
-      env:
-        USE_64: 1
-
-    extra:
-      treeherder:
-        build:
-          platform: linux64
-        machine:
-          platform: linux64
-        collection:
-          debug: true
-        groupSymbol: Builds
-        groupName: Various builds
-        symbol: noTLSv1.3
-
 - task:
     metadata:
       name: "Linux 64 (debug, clang-3.8)"
       description: "Linux 64 (debug, clang-3.8)"
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: clang
         GXX_VERSION: clang++
         USE_64: 1
@@ -85,7 +62,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-4.8
         GXX_VERSION: g++-4.8
         USE_64: 1
@@ -109,7 +85,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-6
         GXX_VERSION: g++-6
         USE_64: 1
@@ -134,7 +109,6 @@
     payload:
       env:
         NSS_NO_PKCS11_BYPASS: 1
-        NSS_ENABLE_TLS_1_3: 1
         USE_64: 1
 
     extra:
@@ -156,7 +130,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         NSS_DISABLE_LIBPKIX: 1
         USE_64: 1
 

diff --git a/automation/taskcluster/graph/linux/build64-opt.yml b/automation/taskcluster/graph/linux/build64-opt.yml
@@ -6,7 +6,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         BUILD_OPT: 1
         USE_64: 1
 
@@ -34,36 +33,13 @@
     - ssl
     - tools
 
-- task:
-    metadata:
-      name: "Linux 64 (opt, no TLS 1.3)"
-      description: "Linux 64 (opt, no TLS 1.3)"
-
-    payload:
-      env:
-        BUILD_OPT: 1
-        USE_64: 1
-
-    extra:
-      treeherder:
-        build:
-          platform: linux64
-        machine:
-          platform: linux64
-        collection:
-          opt: true
-        groupSymbol: Builds
-        groupName: Various builds
-        symbol: noTLSv1.3
-
 - task:
     metadata:
       name: "Linux 64 (opt, clang-3.8)"
       description: "Linux 64 (opt, clang-3.8)"
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: clang
         GXX_VERSION: clang++
         BUILD_OPT: 1
@@ -88,7 +64,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-4.8
         GXX_VERSION: g++-4.8
         BUILD_OPT: 1
@@ -113,7 +88,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         GCC_VERSION: gcc-6
         GXX_VERSION: g++-6
         BUILD_OPT: 1
@@ -139,7 +113,6 @@
     payload:
       env:
         NSS_NO_PKCS11_BYPASS: 1
-        NSS_ENABLE_TLS_1_3: 1
         BUILD_OPT: 1
         USE_64: 1
 

diff --git a/automation/taskcluster/graph/windows/build64-debug.yml b/automation/taskcluster/graph/windows/build64-debug.yml
@@ -6,7 +6,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         USE_64: 1
 
     extra:
@@ -31,27 +30,6 @@
     - smime
     - tools
 
-- task:
-    metadata:
-      name: "Windows 2012 64 (debug, no TLS 1.3)"
-      description: "Windows 2012 64 (debug, no TLS 1.3)"
-
-    payload:
-      env:
-        USE_64: 1
-
-    extra:
-      treeherder:
-        build:
-          platform: windows2012-64
-        machine:
-          platform: windows2012-64
-        collection:
-          debug: true
-        groupSymbol: Builds
-        groupName: Various builds
-        symbol: noTLSv1.3
-
 - task:
     metadata:
       name: "Windows 2012 64 (debug, NSS_NO_PKCS11_BYPASS=1)"
@@ -60,7 +38,6 @@
     payload:
       env:
         NSS_NO_PKCS11_BYPASS: 1
-        NSS_ENABLE_TLS_1_3: 1
         USE_64: 1
 
     extra:

diff --git a/automation/taskcluster/graph/windows/build64-opt.yml b/automation/taskcluster/graph/windows/build64-opt.yml
@@ -6,7 +6,6 @@
 
     payload:
       env:
-        NSS_ENABLE_TLS_1_3: 1
         BUILD_OPT: 1
         USE_64: 1
 
@@ -32,28 +31,6 @@
     - smime
     - tools
 
-- task:
-    metadata:
-      name: "Windows 2012 64 (opt, no TLS 1.3)"
-      description: "Windows 2012 64 (opt, no TLS 1.3)"
-
-    payload:
-      env:
-        BUILD_OPT: 1
-        USE_64: 1
-
-    extra:
-      treeherder:
-        build:
-          platform: windows2012-64
-        machine:
-          platform: windows2012-64
-        collection:
-          opt: true
-        groupSymbol: Builds
-        groupName: Various builds
-        symbol: noTLSv1.3
-
 - task:
     metadata:
       name: "Windows 2012 64 (opt, NSS_NO_PKCS11_BYPASS=1)"
@@ -62,7 +39,6 @@
     payload:
       env:
         NSS_NO_PKCS11_BYPASS: 1
-        NSS_ENABLE_TLS_1_3: 1
         BUILD_OPT: 1
         USE_64: 1
 

diff --git a/coreconf/config.mk b/coreconf/config.mk
@@ -217,11 +217,3 @@ NSS_SSL_ENABLE_ZLIB = 1
 ifdef NSS_NO_PKCS11_BYPASS
 DEFINES += -DNO_PKCS11_BYPASS
 endif
-
-# Allow build-time configuration of TLS 1.3 (Experimental)
-ifdef NSS_ENABLE_TLS_1_3
-ifdef NSS_DISABLE_ECC
-$(error Setting NSS_ENABLE_TLS_1_3 and NSS_DISABLE_ECC isn't a good idea.)
-endif
-DEFINES += -DNSS_ENABLE_TLS_1_3
-endif