Add TLS 1.3 ciphers

Author: abbra

base/native-tools/src/sslget/sslget.c

@@ -587,7 +587,7 @@ client_main(
     SSLCipherSuiteInfo info;
     SSLVersionRange versions = {
         SSL_LIBRARY_VERSION_TLS_1_1,
-        SSL_LIBRARY_VERSION_TLS_1_2
+        SSL_LIBRARY_VERSION_TLS_1_3
     };
     SECStatus status;
 

base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java

@@ -185,7 +185,10 @@ public class CryptoUtil {
         SSLSocket.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
         SSLSocket.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
         SSLSocket.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-        SSLSocket.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+        SSLSocket.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+        SSLSocket.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+        SSLSocket.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+        SSLSocket.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
     };
     static public List<Integer> clientECCipherList = new ArrayList<Integer>(Arrays.asList(clientECCiphers));
 
@@ -953,6 +956,19 @@ public static void setSSLDatagramVersionRange(SSLVersion min, SSLVersion max) th
         cipherMap.put("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
                 SSLSocket.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256);
 
+        // TLSv1_3
+        cipherMap.put("TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+                SSLSocket.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256);
+        cipherMap.put("TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
+                SSLSocket.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256);
+        cipherMap.put("TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+                SSLSocket.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256);
+        cipherMap.put("TLS_AES_128_GCM_SHA256",
+                SSLSocket.TLS_AES_128_GCM_SHA256);
+        cipherMap.put("TLS_AES_256_GCM_SHA384",
+                SSLSocket.TLS_AES_256_GCM_SHA384);
+        cipherMap.put("TLS_CHACHA20_POLY1305_SHA256",
+                SSLSocket.TLS_CHACHA20_POLY1305_SHA256);
     }
 
     public static void setClientCiphers(String list) throws SocketException {