resync with golang 1.14.3

signalsciences · May 19, 2020 · f7904b0 · f7904b0
1 parent 9f05ee7
commit f7904b0
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/ciphermap.go b/ciphermap.go
@@ -143,6 +143,8 @@ var cipherMap = map[uint16]string{
 	0x00C3: "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256",
 	0x00C4: "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256",
 	0x00C5: "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256",
+	0x00C6: "TLS_SM4_GCM_SM3",
+	0x00C7: "TLS_SM4_CCM_SM3",
 	0x00FF: "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
 	0x1301: "TLS_AES_128_GCM_SHA256",
 	0x1302: "TLS_AES_256_GCM_SHA384",
@@ -329,6 +331,15 @@ var cipherMap = map[uint16]string{
 	0xC0B1: "TLS_ECCPWD_WITH_AES_256_GCM_SHA384",
 	0xC0B2: "TLS_ECCPWD_WITH_AES_128_CCM_SHA256",
 	0xC0B3: "TLS_ECCPWD_WITH_AES_256_CCM_SHA384",
+	0xC0B4: "TLS_SHA256_SHA256",
+	0xC0B5: "TLS_SHA384_SHA384",
+	0xC100: "TLS_GOSTR341112_256_WITH_KUZNYECHIK_CTR_OMAC",
+	0xC101: "TLS_GOSTR341112_256_WITH_MAGMA_CTR_OMAC",
+	0xC102: "TLS_GOSTR341112_256_WITH_28147_CNT_IMIT",
+	0xC103: "TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L",
+	0xC104: "TLS_GOSTR341112_256_WITH_MAGMA_MGM_L",
+	0xC105: "TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S",
+	0xC106: "TLS_GOSTR341112_256_WITH_MAGMA_MGM_S",
 	0xCCA8: "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
 	0xCCA9: "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
 	0xCCAA: "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
@@ -579,6 +590,13 @@ var cipherStringMap = map[string]uint16{
 	"TLS_ECDH_anon_WITH_RC4_128_SHA":                0xC016,
 	"TLS_EMPTY_RENEGOTIATION_INFO_SCSV":             0x00FF,
 	"TLS_FALLBACK_SCSV":                             0x5600,
+	"TLS_GOSTR341112_256_WITH_28147_CNT_IMIT":       0xC102,
+	"TLS_GOSTR341112_256_WITH_KUZNYECHIK_CTR_OMAC":  0xC100,
+	"TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L":     0xC103,
+	"TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S":     0xC105,
+	"TLS_GOSTR341112_256_WITH_MAGMA_CTR_OMAC":       0xC101,
+	"TLS_GOSTR341112_256_WITH_MAGMA_MGM_L":          0xC104,
+	"TLS_GOSTR341112_256_WITH_MAGMA_MGM_S":          0xC106,
 	"TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5":           0x0029,
 	"TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA":           0x0026,
 	"TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5":           0x002A,
@@ -672,6 +690,10 @@ var cipherStringMap = map[string]uint16{
 	"TLS_RSA_WITH_RC4_128_MD5":                      0x0004,
 	"TLS_RSA_WITH_RC4_128_SHA":                      0x0005,
 	"TLS_RSA_WITH_SEED_CBC_SHA":                     0x0096,
+	"TLS_SHA256_SHA256":                             0xC0B4,
+	"TLS_SHA384_SHA384":                             0xC0B5,
+	"TLS_SM4_CCM_SM3":                               0x00C7,
+	"TLS_SM4_GCM_SM3":                               0x00C6,
 	"TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA":         0xC01C,
 	"TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA":          0xC01F,
 	"TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA":          0xC022,