mapping.md in tls-map-1.1.0

- old
+ new

@@ -1,35 +1,35 @@
 Codepoint | IANA | OpenSSL | GnuTLS | NSS
 --- | --- | --- | --- | ---
 0000 | TLS_NULL_WITH_NULL_NULL | - | - | TLS_NULL_WITH_NULL_NULL
-0001 | TLS_RSA_WITH_NULL_MD5 | - | RSA_NULL_MD5 | TLS_RSA_WITH_NULL_MD5
-0002 | TLS_RSA_WITH_NULL_SHA | - | RSA_NULL_SHA1 | TLS_RSA_WITH_NULL_SHA
-0003 | TLS_RSA_EXPORT_WITH_RC4_40_MD5 | - | - | TLS_RSA_EXPORT_WITH_RC4_40_MD5
-0004 | TLS_RSA_WITH_RC4_128_MD5 | - | RSA_ARCFOUR_128_MD5 | TLS_RSA_WITH_RC4_128_MD5
-0005 | TLS_RSA_WITH_RC4_128_SHA | - | RSA_ARCFOUR_128_SHA1 | TLS_RSA_WITH_RC4_128_SHA
-0006 | TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 | - | - | TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
-0007 | TLS_RSA_WITH_IDEA_CBC_SHA | - | - | TLS_RSA_WITH_IDEA_CBC_SHA
-0008 | TLS_RSA_EXPORT_WITH_DES40_CBC_SHA | - | - | TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
-0009 | TLS_RSA_WITH_DES_CBC_SHA | - | - | TLS_RSA_WITH_DES_CBC_SHA
-000A | TLS_RSA_WITH_3DES_EDE_CBC_SHA | - | RSA_3DES_EDE_CBC_SHA1 | -
-000B | TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA | - | - | -
-000C | TLS_DH_DSS_WITH_DES_CBC_SHA | - | - | -
-000D | TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA | - | - | -
-000E | TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA | - | - | -
-000F | TLS_DH_RSA_WITH_DES_CBC_SHA | - | - | -
-0010 | TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA | - | - | TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
-0011 | TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA | - | - | TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
-0012 | TLS_DHE_DSS_WITH_DES_CBC_SHA | - | - | TLS_DHE_DSS_WITH_DES_CBC_SHA
-0013 | TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA | - | DHE_DSS_3DES_EDE_CBC_SHA1 | TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-0014 | TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA | - | - | TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
-0015 | TLS_DHE_RSA_WITH_DES_CBC_SHA | - | - | TLS_DHE_RSA_WITH_DES_CBC_SHA
-0016 | TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA | - | DHE_RSA_3DES_EDE_CBC_SHA1 | TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-0017 | TLS_DH_anon_EXPORT_WITH_RC4_40_MD5 | - | - | TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
-0018 | TLS_DH_anon_WITH_RC4_128_MD5 | - | DH_ANON_ARCFOUR_128_MD5 | TLS_DH_anon_WITH_RC4_128_MD5
-0019 | TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA | - | - | TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
-001A | TLS_DH_anon_WITH_DES_CBC_SHA | - | - | -
-001B | TLS_DH_anon_WITH_3DES_EDE_CBC_SHA | - | DH_ANON_3DES_EDE_CBC_SHA1 | -
+0001 | TLS_RSA_WITH_NULL_MD5 | NULL-MD5 | RSA_NULL_MD5 | TLS_RSA_WITH_NULL_MD5
+0002 | TLS_RSA_WITH_NULL_SHA | NULL-SHA | RSA_NULL_SHA1 | TLS_RSA_WITH_NULL_SHA
+0003 | TLS_RSA_EXPORT_WITH_RC4_40_MD5 | EXP-RC4-MD5 | - | TLS_RSA_EXPORT_WITH_RC4_40_MD5
+0004 | TLS_RSA_WITH_RC4_128_MD5 | RC4-MD5 | RSA_ARCFOUR_128_MD5 | TLS_RSA_WITH_RC4_128_MD5
+0005 | TLS_RSA_WITH_RC4_128_SHA | RC4-SHA | RSA_ARCFOUR_128_SHA1 | TLS_RSA_WITH_RC4_128_SHA
+0006 | TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 | EXP-RC2-CBC-MD5 | - | TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5
+0007 | TLS_RSA_WITH_IDEA_CBC_SHA | IDEA-CBC-SHA | - | TLS_RSA_WITH_IDEA_CBC_SHA
+0008 | TLS_RSA_EXPORT_WITH_DES40_CBC_SHA | EXP-DES-CBC-SHA | - | TLS_RSA_EXPORT_WITH_DES40_CBC_SHA
+0009 | TLS_RSA_WITH_DES_CBC_SHA | DES-CBC-SHA | - | TLS_RSA_WITH_DES_CBC_SHA
+000A | TLS_RSA_WITH_3DES_EDE_CBC_SHA | DES-CBC3-SHA | RSA_3DES_EDE_CBC_SHA1 | TLS_RSA_WITH_3DES_EDE_CBC_SHA
+000B | TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA | EXP-DH-DSS-DES-CBC-SHA | - | TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA
+000C | TLS_DH_DSS_WITH_DES_CBC_SHA | DH-DSS-DES-CBC-SHA | - | TLS_DH_DSS_WITH_DES_CBC_SHA
+000D | TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA | DH-DSS-DES-CBC3-SHA | - | TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA
+000E | TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA | EXP-DH-RSA-DES-CBC-SHA | - | TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA
+000F | TLS_DH_RSA_WITH_DES_CBC_SHA | DH-RSA-DES-CBC-SHA | - | TLS_DH_RSA_WITH_DES_CBC_SHA
+0010 | TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA | DH-RSA-DES-CBC3-SHA | - | TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA
+0011 | TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA | EXP-DHE-DSS-DES-CBC-SHA | - | TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA
+0012 | TLS_DHE_DSS_WITH_DES_CBC_SHA | DHE-DSS-DES-CBC-SHA | - | TLS_DHE_DSS_WITH_DES_CBC_SHA
+0013 | TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA | DHE-DSS-DES-CBC3-SHA | DHE_DSS_3DES_EDE_CBC_SHA1 | TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA
+0014 | TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA | EXP-DHE-RSA-DES-CBC-SHA | - | TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA
+0015 | TLS_DHE_RSA_WITH_DES_CBC_SHA | DHE-RSA-DES-CBC-SHA | - | TLS_DHE_RSA_WITH_DES_CBC_SHA
+0016 | TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA | DHE-RSA-DES-CBC3-SHA | DHE_RSA_3DES_EDE_CBC_SHA1 | TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
+0017 | TLS_DH_anon_EXPORT_WITH_RC4_40_MD5 | EXP-ADH-RC4-MD5 | - | TLS_DH_anon_EXPORT_WITH_RC4_40_MD5
+0018 | TLS_DH_anon_WITH_RC4_128_MD5 | ADH-RC4-MD5 | DH_ANON_ARCFOUR_128_MD5 | TLS_DH_anon_WITH_RC4_128_MD5
+0019 | TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA | EXP-ADH-DES-CBC-SHA | - | TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA
+001A | TLS_DH_anon_WITH_DES_CBC_SHA | ADH-DES-CBC-SHA | - | TLS_DH_anon_WITH_DES_CBC_SHA
+001B | TLS_DH_anon_WITH_3DES_EDE_CBC_SHA | ADH-DES-CBC3-SHA | DH_ANON_3DES_EDE_CBC_SHA1 | TLS_DH_anon_WITH_3DES_EDE_CBC_SHA
 001E | TLS_KRB5_WITH_DES_CBC_SHA | - | - | -
 001F | TLS_KRB5_WITH_3DES_EDE_CBC_SHA | - | - | -
 0020 | TLS_KRB5_WITH_RC4_128_SHA | - | - | -
 0021 | TLS_KRB5_WITH_IDEA_CBC_SHA | - | - | -
 0022 | TLS_KRB5_WITH_DES_CBC_MD5 | - | - | -
@@ -40,13 +40,13 @@
 0027 | TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA | - | - | -
 0028 | TLS_KRB5_EXPORT_WITH_RC4_40_SHA | - | - | -
 0029 | TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5 | - | - | -
 002A | TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5 | - | - | -
 002B | TLS_KRB5_EXPORT_WITH_RC4_40_MD5 | - | - | -
-002C | TLS_PSK_WITH_NULL_SHA | PSK-NULL-SHA | - | -
-002D | TLS_DHE_PSK_WITH_NULL_SHA | DHE-PSK-NULL-SHA | - | -
-002E | TLS_RSA_PSK_WITH_NULL_SHA | RSA-PSK-NULL-SHA | - | -
+002C | TLS_PSK_WITH_NULL_SHA | PSK-NULL-SHA | PSK_NULL_SHA1 | -
+002D | TLS_DHE_PSK_WITH_NULL_SHA | DHE-PSK-NULL-SHA | DHE_PSK_NULL_SHA1 | -
+002E | TLS_RSA_PSK_WITH_NULL_SHA | RSA-PSK-NULL-SHA | RSA_PSK_NULL_SHA1 | -
 002F | TLS_RSA_WITH_AES_128_CBC_SHA | AES128-SHA | RSA_AES_128_CBC_SHA1 | TLS_RSA_WITH_AES_128_CBC_SHA
 0030 | TLS_DH_DSS_WITH_AES_128_CBC_SHA | DH-DSS-AES128-SHA | - | TLS_DH_DSS_WITH_AES_128_CBC_SHA
 0031 | TLS_DH_RSA_WITH_AES_128_CBC_SHA | DH-RSA-AES128-SHA | - | TLS_DH_RSA_WITH_AES_128_CBC_SHA
 0032 | TLS_DHE_DSS_WITH_AES_128_CBC_SHA | DHE-DSS-AES128-SHA | DHE_DSS_AES_128_CBC_SHA1 | TLS_DHE_DSS_WITH_AES_128_CBC_SHA
 0033 | TLS_DHE_RSA_WITH_AES_128_CBC_SHA | DHE-RSA-AES128-SHA | DHE_RSA_AES_128_CBC_SHA1 | TLS_DHE_RSA_WITH_AES_128_CBC_SHA
@@ -61,29 +61,29 @@
 003C | TLS_RSA_WITH_AES_128_CBC_SHA256 | AES128-SHA256 | RSA_AES_128_CBC_SHA256 | TLS_RSA_WITH_AES_128_CBC_SHA256
 003D | TLS_RSA_WITH_AES_256_CBC_SHA256 | AES256-SHA256 | RSA_AES_256_CBC_SHA256 | TLS_RSA_WITH_AES_256_CBC_SHA256
 003E | TLS_DH_DSS_WITH_AES_128_CBC_SHA256 | DH-DSS-AES128-SHA256 | - | -
 003F | TLS_DH_RSA_WITH_AES_128_CBC_SHA256 | DH-RSA-AES128-SHA256 | - | -
 0040 | TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 | DHE-DSS-AES128-SHA256 | DHE_DSS_AES_128_CBC_SHA256 | TLS_DHE_DSS_WITH_AES_128_CBC_SHA256
-0041 | TLS_RSA_WITH_CAMELLIA_128_CBC_SHA | CAMELLIA128-SHA | - | TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
+0041 | TLS_RSA_WITH_CAMELLIA_128_CBC_SHA | CAMELLIA128-SHA | RSA_CAMELLIA_128_CBC_SHA1 | TLS_RSA_WITH_CAMELLIA_128_CBC_SHA
 0042 | TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA | DH-DSS-CAMELLIA128-SHA | - | TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA
 0043 | TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA | DH-RSA-CAMELLIA128-SHA | - | TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA
-0044 | TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA | DHE-DSS-CAMELLIA128-SHA | - | TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA
-0045 | TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA | DHE-RSA-CAMELLIA128-SHA | - | TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
-0046 | TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA | ADH-CAMELLIA128-SHA | - | TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA
+0044 | TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA | DHE-DSS-CAMELLIA128-SHA | DHE_DSS_CAMELLIA_128_CBC_SHA1 | TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA
+0045 | TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA | DHE-RSA-CAMELLIA128-SHA | DHE_RSA_CAMELLIA_128_CBC_SHA1 | TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
+0046 | TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA | ADH-CAMELLIA128-SHA | DH_ANON_CAMELLIA_128_CBC_SHA1 | TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA
 0067 | TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 | DHE-RSA-AES128-SHA256 | DHE_RSA_AES_128_CBC_SHA256 | TLS_DHE_RSA_WITH_AES_128_CBC_SHA256
 0068 | TLS_DH_DSS_WITH_AES_256_CBC_SHA256 | DH-DSS-AES256-SHA256 | - | -
 0069 | TLS_DH_RSA_WITH_AES_256_CBC_SHA256 | DH-RSA-AES256-SHA256 | - | -
 006A | TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 | DHE-DSS-AES256-SHA256 | DHE_DSS_AES_256_CBC_SHA256 | TLS_DHE_DSS_WITH_AES_256_CBC_SHA256
 006B | TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 | DHE-RSA-AES256-SHA256 | DHE_RSA_AES_256_CBC_SHA256 | TLS_DHE_RSA_WITH_AES_256_CBC_SHA256
 006C | TLS_DH_anon_WITH_AES_128_CBC_SHA256 | ADH-AES128-SHA256 | DH_ANON_AES_128_CBC_SHA256 | -
 006D | TLS_DH_anon_WITH_AES_256_CBC_SHA256 | ADH-AES256-SHA256 | DH_ANON_AES_256_CBC_SHA256 | -
-0084 | TLS_RSA_WITH_CAMELLIA_256_CBC_SHA | CAMELLIA256-SHA | - | TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
+0084 | TLS_RSA_WITH_CAMELLIA_256_CBC_SHA | CAMELLIA256-SHA | RSA_CAMELLIA_256_CBC_SHA1 | TLS_RSA_WITH_CAMELLIA_256_CBC_SHA
 0085 | TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA | DH-DSS-CAMELLIA256-SHA | - | TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA
 0086 | TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA | DH-RSA-CAMELLIA256-SHA | - | TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA
-0087 | TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA | DHE-DSS-CAMELLIA256-SHA | - | TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA
-0088 | TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA | DHE-RSA-CAMELLIA256-SHA | - | TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
-0089 | TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA | ADH-CAMELLIA256-SHA | - | TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA
+0087 | TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA | DHE-DSS-CAMELLIA256-SHA | DHE_DSS_CAMELLIA_256_CBC_SHA1 | TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA
+0088 | TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA | DHE-RSA-CAMELLIA256-SHA | DHE_RSA_CAMELLIA_256_CBC_SHA1 | TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA
+0089 | TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA | ADH-CAMELLIA256-SHA | DH_ANON_CAMELLIA_256_CBC_SHA1 | TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA
 008A | TLS_PSK_WITH_RC4_128_SHA | PSK-RC4-SHA | PSK_ARCFOUR_128_SHA1 | -
 008B | TLS_PSK_WITH_3DES_EDE_CBC_SHA | PSK-3DES-EDE-CBC-SHA | PSK_3DES_EDE_CBC_SHA1 | -
 008C | TLS_PSK_WITH_AES_128_CBC_SHA | PSK-AES128-CBC-SHA | PSK_AES_128_CBC_SHA1 | -
 008D | TLS_PSK_WITH_AES_256_CBC_SHA | PSK-AES256-CBC-SHA | PSK_AES_256_CBC_SHA1 | -
 008E | TLS_DHE_PSK_WITH_RC4_128_SHA | DHE-PSK-RC4-SHA | DHE_PSK_ARCFOUR_128_SHA1 | -
@@ -100,69 +100,69 @@
 0099 | TLS_DHE_DSS_WITH_SEED_CBC_SHA | DHE-DSS-SEED-SHA | - | -
 009A | TLS_DHE_RSA_WITH_SEED_CBC_SHA | DHE-RSA-SEED-SHA | - | -
 009B | TLS_DH_anon_WITH_SEED_CBC_SHA | ADH-SEED-SHA | - | -
 009C | TLS_RSA_WITH_AES_128_GCM_SHA256 | AES128-GCM-SHA256 | RSA_AES_128_GCM_SHA256 | TLS_RSA_WITH_AES_128_GCM_SHA256
 009D | TLS_RSA_WITH_AES_256_GCM_SHA384 | AES256-GCM-SHA384 | RSA_AES_256_GCM_SHA384 | TLS_RSA_WITH_AES_256_GCM_SHA384
-009E | TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 | DHE-RSA-AES128-GCM-SHA256 | - | TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
-009F | TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 | DHE-RSA-AES256-GCM-SHA384 | - | TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
+009E | TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 | DHE-RSA-AES128-GCM-SHA256 | DHE_RSA_AES_128_GCM_SHA256 | TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
+009F | TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 | DHE-RSA-AES256-GCM-SHA384 | DHE_RSA_AES_256_GCM_SHA384 | TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
 00A0 | TLS_DH_RSA_WITH_AES_128_GCM_SHA256 | DH-RSA-AES128-GCM-SHA256 | - | -
 00A1 | TLS_DH_RSA_WITH_AES_256_GCM_SHA384 | DH-RSA-AES256-GCM-SHA384 | - | -
-00A2 | TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 | DHE-DSS-AES128-GCM-SHA256 | - | TLS_DHE_DSS_WITH_AES_128_GCM_SHA256
-00A3 | TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 | DHE-DSS-AES256-GCM-SHA384 | - | TLS_DHE_DSS_WITH_AES_256_GCM_SHA384
+00A2 | TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 | DHE-DSS-AES128-GCM-SHA256 | DHE_DSS_AES_128_GCM_SHA256 | TLS_DHE_DSS_WITH_AES_128_GCM_SHA256
+00A3 | TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 | DHE-DSS-AES256-GCM-SHA384 | DHE_DSS_AES_256_GCM_SHA384 | TLS_DHE_DSS_WITH_AES_256_GCM_SHA384
 00A4 | TLS_DH_DSS_WITH_AES_128_GCM_SHA256 | DH-DSS-AES128-GCM-SHA256 | - | -
 00A5 | TLS_DH_DSS_WITH_AES_256_GCM_SHA384 | DH-DSS-AES256-GCM-SHA384 | - | -
-00A6 | TLS_DH_anon_WITH_AES_128_GCM_SHA256 | ADH-AES128-GCM-SHA256 | - | -
-00A7 | TLS_DH_anon_WITH_AES_256_GCM_SHA384 | ADH-AES256-GCM-SHA384 | - | -
+00A6 | TLS_DH_anon_WITH_AES_128_GCM_SHA256 | ADH-AES128-GCM-SHA256 | DH_ANON_AES_128_GCM_SHA256 | -
+00A7 | TLS_DH_anon_WITH_AES_256_GCM_SHA384 | ADH-AES256-GCM-SHA384 | DH_ANON_AES_256_GCM_SHA384 | -
 00A8 | TLS_PSK_WITH_AES_128_GCM_SHA256 | PSK-AES128-GCM-SHA256 | PSK_AES_128_GCM_SHA256 | -
 00A9 | TLS_PSK_WITH_AES_256_GCM_SHA384 | PSK-AES256-GCM-SHA384 | PSK_AES_256_GCM_SHA384 | -
 00AA | TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 | DHE-PSK-AES128-GCM-SHA256 | DHE_PSK_AES_128_GCM_SHA256 | TLS_DHE_PSK_WITH_AES_128_GCM_SHA256
 00AB | TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 | DHE-PSK-AES256-GCM-SHA384 | DHE_PSK_AES_256_GCM_SHA384 | TLS_DHE_PSK_WITH_AES_256_GCM_SHA384
-00AC | TLS_RSA_PSK_WITH_AES_128_GCM_SHA256 | RSA-PSK-AES128-GCM-SHA256 | - | -
-00AD | TLS_RSA_PSK_WITH_AES_256_GCM_SHA384 | RSA-PSK-AES256-GCM-SHA384 | - | -
+00AC | TLS_RSA_PSK_WITH_AES_128_GCM_SHA256 | RSA-PSK-AES128-GCM-SHA256 | RSA_PSK_AES_128_GCM_SHA256 | -
+00AD | TLS_RSA_PSK_WITH_AES_256_GCM_SHA384 | RSA-PSK-AES256-GCM-SHA384 | RSA_PSK_AES_256_GCM_SHA384 | -
 00AE | TLS_PSK_WITH_AES_128_CBC_SHA256 | PSK-AES128-CBC-SHA256 | PSK_AES_128_CBC_SHA256 | -
-00AF | TLS_PSK_WITH_AES_256_CBC_SHA384 | PSK-AES256-CBC-SHA384 | - | -
+00AF | TLS_PSK_WITH_AES_256_CBC_SHA384 | PSK-AES256-CBC-SHA384 | PSK_AES_256_CBC_SHA384 | -
 00B0 | TLS_PSK_WITH_NULL_SHA256 | PSK-NULL-SHA256 | PSK_NULL_SHA256 | -
-00B1 | TLS_PSK_WITH_NULL_SHA384 | PSK-NULL-SHA384 | - | -
+00B1 | TLS_PSK_WITH_NULL_SHA384 | PSK-NULL-SHA384 | PSK_NULL_SHA384 | -
 00B2 | TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 | DHE-PSK-AES128-CBC-SHA256 | DHE_PSK_AES_128_CBC_SHA256 | -
-00B3 | TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 | DHE-PSK-AES256-CBC-SHA384 | - | -
+00B3 | TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 | DHE-PSK-AES256-CBC-SHA384 | DHE_PSK_AES_256_CBC_SHA384 | -
 00B4 | TLS_DHE_PSK_WITH_NULL_SHA256 | DHE-PSK-NULL-SHA256 | DHE_PSK_NULL_SHA256 | -
-00B5 | TLS_DHE_PSK_WITH_NULL_SHA384 | DHE-PSK-NULL-SHA384 | - | -
-00B6 | TLS_RSA_PSK_WITH_AES_128_CBC_SHA256 | RSA-PSK-AES128-CBC-SHA256 | - | -
-00B7 | TLS_RSA_PSK_WITH_AES_256_CBC_SHA384 | RSA-PSK-AES256-CBC-SHA384 | - | -
-00B8 | TLS_RSA_PSK_WITH_NULL_SHA256 | RSA-PSK-NULL-SHA256 | - | -
-00B9 | TLS_RSA_PSK_WITH_NULL_SHA384 | RSA-PSK-NULL-SHA384 | - | -
-00BA | TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 | CAMELLIA128-SHA256 | - | -
+00B5 | TLS_DHE_PSK_WITH_NULL_SHA384 | DHE-PSK-NULL-SHA384 | DHE_PSK_NULL_SHA384 | -
+00B6 | TLS_RSA_PSK_WITH_AES_128_CBC_SHA256 | RSA-PSK-AES128-CBC-SHA256 | RSA_PSK_AES_128_CBC_SHA256 | -
+00B7 | TLS_RSA_PSK_WITH_AES_256_CBC_SHA384 | RSA-PSK-AES256-CBC-SHA384 | RSA_PSK_AES_256_CBC_SHA384 | -
+00B8 | TLS_RSA_PSK_WITH_NULL_SHA256 | RSA-PSK-NULL-SHA256 | RSA_PSK_NULL_SHA256 | -
+00B9 | TLS_RSA_PSK_WITH_NULL_SHA384 | RSA-PSK-NULL-SHA384 | RSA_PSK_NULL_SHA384 | -
+00BA | TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 | CAMELLIA128-SHA256 | RSA_CAMELLIA_128_CBC_SHA256 | -
 00BB | TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256 | DH-DSS-CAMELLIA128-SHA256 | - | -
 00BC | TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256 | DH-RSA-CAMELLIA128-SHA256 | - | -
-00BD | TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 | DHE-DSS-CAMELLIA128-SHA256 | - | -
-00BE | TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 | DHE-RSA-CAMELLIA128-SHA256 | - | -
-00BF | TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256 | ADH-CAMELLIA128-SHA256 | - | -
-00C0 | TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 | CAMELLIA256-SHA256 | - | -
+00BD | TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 | DHE-DSS-CAMELLIA128-SHA256 | DHE_DSS_CAMELLIA_128_CBC_SHA256 | -
+00BE | TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 | DHE-RSA-CAMELLIA128-SHA256 | DHE_RSA_CAMELLIA_128_CBC_SHA256 | -
+00BF | TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256 | ADH-CAMELLIA128-SHA256 | DH_ANON_CAMELLIA_128_CBC_SHA256 | -
+00C0 | TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 | CAMELLIA256-SHA256 | RSA_CAMELLIA_256_CBC_SHA256 | -
 00C1 | TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256 | DH-DSS-CAMELLIA256-SHA256 | - | -
 00C2 | TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256 | DH-RSA-CAMELLIA256-SHA256 | - | -
-00C3 | TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 | DHE-DSS-CAMELLIA256-SHA256 | - | -
-00C4 | TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 | DHE-RSA-CAMELLIA256-SHA256 | - | -
-00C5 | TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256 | ADH-CAMELLIA256-SHA256 | - | -
+00C3 | TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 | DHE-DSS-CAMELLIA256-SHA256 | DHE_DSS_CAMELLIA_256_CBC_SHA256 | -
+00C4 | TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 | DHE-RSA-CAMELLIA256-SHA256 | DHE_RSA_CAMELLIA_256_CBC_SHA256 | -
+00C5 | TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256 | ADH-CAMELLIA256-SHA256 | DH_ANON_CAMELLIA_256_CBC_SHA256 | -
 00C6 | TLS_SM4_GCM_SM3 | - | - | -
 00C7 | TLS_SM4_CCM_SM3 | - | - | -
 00FF | TLS_EMPTY_RENEGOTIATION_INFO_SCSV | - | - | TLS_EMPTY_RENEGOTIATION_INFO_SCSV
 1301 | TLS_AES_128_GCM_SHA256 | TLS_AES_128_GCM_SHA256 | AES_128_GCM_SHA256 | TLS_AES_128_GCM_SHA256
 1302 | TLS_AES_256_GCM_SHA384 | TLS_AES_256_GCM_SHA384 | AES_256_GCM_SHA384 | TLS_AES_256_GCM_SHA384
 1303 | TLS_CHACHA20_POLY1305_SHA256 | TLS_CHACHA20_POLY1305_SHA256 | CHACHA20_POLY1305_SHA256 | TLS_CHACHA20_POLY1305_SHA256
 1304 | TLS_AES_128_CCM_SHA256 | TLS_AES_128_CCM_SHA256 | AES_128_CCM_SHA256 | -
-1305 | TLS_AES_128_CCM_8_SHA256 | TLS_AES_128_CCM_8_SHA256 | - | -
+1305 | TLS_AES_128_CCM_8_SHA256 | TLS_AES_128_CCM_8_SHA256 | AES_128_CCM_8_SHA256 | -
 5600 | TLS_FALLBACK_SCSV | - | - | TLS_FALLBACK_SCSV
 C001 | TLS_ECDH_ECDSA_WITH_NULL_SHA | ECDH-ECDSA-NULL-SHA | - | TLS_ECDH_ECDSA_WITH_NULL_SHA
 C002 | TLS_ECDH_ECDSA_WITH_RC4_128_SHA | ECDH-ECDSA-RC4-SHA | - | TLS_ECDH_ECDSA_WITH_RC4_128_SHA
 C003 | TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA | ECDH-ECDSA-DES-CBC3-SHA | - | TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
 C004 | TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA | ECDH-ECDSA-AES128-SHA | - | TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
 C005 | TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA | ECDH-ECDSA-AES256-SHA | - | TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
-C006 | TLS_ECDHE_ECDSA_WITH_NULL_SHA | ECDHE-ECDSA-NULL-SHA | - | TLS_ECDHE_ECDSA_WITH_NULL_SHA
+C006 | TLS_ECDHE_ECDSA_WITH_NULL_SHA | ECDHE-ECDSA-NULL-SHA | ECDHE_ECDSA_NULL_SHA1 | TLS_ECDHE_ECDSA_WITH_NULL_SHA
 C007 | TLS_ECDHE_ECDSA_WITH_RC4_128_SHA | ECDHE-ECDSA-RC4-SHA | ECDHE_ECDSA_ARCFOUR_128_SHA1 | TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
-C008 | TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA | ECDHE-ECDSA-DES-CBC3-SHA | - | TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
-C009 | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA | ECDHE-ECDSA-AES128-SHA | - | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
-C00A | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA | ECDHE-ECDSA-AES256-SHA | - | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+C008 | TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA | ECDHE-ECDSA-DES-CBC3-SHA | ECDHE_ECDSA_3DES_EDE_CBC_SHA1 | TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
+C009 | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA | ECDHE-ECDSA-AES128-SHA | ECDHE_ECDSA_AES_128_CBC_SHA1 | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
+C00A | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA | ECDHE-ECDSA-AES256-SHA | ECDHE_ECDSA_AES_256_CBC_SHA1 | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
 C00B | TLS_ECDH_RSA_WITH_NULL_SHA | ECDH-RSA-NULL-SHA | - | TLS_ECDH_RSA_WITH_NULL_SHA
 C00C | TLS_ECDH_RSA_WITH_RC4_128_SHA | ECDH-RSA-RC4-SHA | - | TLS_ECDH_RSA_WITH_RC4_128_SHA
 C00D | TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA | ECDH-RSA-DES-CBC3-SHA | - | TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
 C00E | TLS_ECDH_RSA_WITH_AES_128_CBC_SHA | ECDH-RSA-AES128-SHA | - | TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
 C00F | TLS_ECDH_RSA_WITH_AES_256_CBC_SHA | ECDH-RSA-AES256-SHA | - | TLS_ECDH_RSA_WITH_AES_256_CBC_SHA
@@ -183,33 +183,33 @@
 C01E | TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA | SRP-RSA-AES-128-CBC-SHA | SRP_SHA_RSA_AES_128_CBC_SHA1 | -
 C01F | TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA | SRP-DSS-AES-128-CBC-SHA | SRP_SHA_DSS_AES_128_CBC_SHA1 | -
 C020 | TLS_SRP_SHA_WITH_AES_256_CBC_SHA | SRP-AES-256-CBC-SHA | SRP_SHA_AES_256_CBC_SHA1 | -
 C021 | TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA | SRP-RSA-AES-256-CBC-SHA | SRP_SHA_RSA_AES_256_CBC_SHA1 | -
 C022 | TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA | SRP-DSS-AES-256-CBC-SHA | SRP_SHA_DSS_AES_256_CBC_SHA1 | -
-C023 | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 | ECDHE-ECDSA-AES128-SHA256 | - | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
-C024 | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 | ECDHE-ECDSA-AES256-SHA384 | - | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
+C023 | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 | ECDHE-ECDSA-AES128-SHA256 | ECDHE_ECDSA_AES_128_CBC_SHA256 | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256
+C024 | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 | ECDHE-ECDSA-AES256-SHA384 | ECDHE_ECDSA_AES_256_CBC_SHA384 | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384
 C025 | TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 | ECDH-ECDSA-AES128-SHA256 | - | -
 C026 | TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 | ECDH-ECDSA-AES256-SHA384 | - | -
-C027 | TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 | ECDHE-RSA-AES128-SHA256 | - | TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
-C028 | TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 | ECDHE-RSA-AES256-SHA384 | - | TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
+C027 | TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 | ECDHE-RSA-AES128-SHA256 | ECDHE_RSA_AES_128_CBC_SHA256 | TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
+C028 | TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 | ECDHE-RSA-AES256-SHA384 | ECDHE_RSA_AES_256_CBC_SHA384 | TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384
 C029 | TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 | ECDH-RSA-AES128-SHA256 | - | -
 C02A | TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 | ECDH-RSA-AES256-SHA384 | - | -
-C02B | TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 | ECDHE-ECDSA-AES128-GCM-SHA256 | - | TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-C02C | TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 | ECDHE-ECDSA-AES256-GCM-SHA384 | - | TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+C02B | TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 | ECDHE-ECDSA-AES128-GCM-SHA256 | ECDHE_ECDSA_AES_128_GCM_SHA256 | TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+C02C | TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 | ECDHE-ECDSA-AES256-GCM-SHA384 | ECDHE_ECDSA_AES_256_GCM_SHA384 | TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
 C02D | TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 | ECDH-ECDSA-AES128-GCM-SHA256 | - | TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
 C02E | TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 | ECDH-ECDSA-AES256-GCM-SHA384 | - | -
-C02F | TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 | ECDHE-RSA-AES128-GCM-SHA256 | - | TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-C030 | TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 | ECDHE-RSA-AES256-GCM-SHA384 | - | TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+C02F | TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 | ECDHE-RSA-AES128-GCM-SHA256 | ECDHE_RSA_AES_128_GCM_SHA256 | TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+C030 | TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 | ECDHE-RSA-AES256-GCM-SHA384 | ECDHE_RSA_AES_256_GCM_SHA384 | TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
 C031 | TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 | ECDH-RSA-AES128-GCM-SHA256 | - | TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
 C032 | TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 | ECDH-RSA-AES256-GCM-SHA384 | - | -
 C033 | TLS_ECDHE_PSK_WITH_RC4_128_SHA | ECDHE-PSK-RC4-SHA | ECDHE_PSK_ARCFOUR_128_SHA1 | -
 C034 | TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA | ECDHE-PSK-3DES-EDE-CBC-SHA | ECDHE_PSK_3DES_EDE_CBC_SHA1 | -
 C035 | TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA | ECDHE-PSK-AES128-CBC-SHA | ECDHE_PSK_AES_128_CBC_SHA1 | -
 C036 | TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA | ECDHE-PSK-AES256-CBC-SHA | ECDHE_PSK_AES_256_CBC_SHA1 | -
 C037 | TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256 | ECDHE-PSK-AES128-CBC-SHA256 | ECDHE_PSK_AES_128_CBC_SHA256 | -
 C038 | TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384 | ECDHE-PSK-AES256-CBC-SHA384 | ECDHE_PSK_AES_256_CBC_SHA384 | -
-C039 | TLS_ECDHE_PSK_WITH_NULL_SHA | ECDHE-PSK-NULL-SHA | - | -
+C039 | TLS_ECDHE_PSK_WITH_NULL_SHA | ECDHE-PSK-NULL-SHA | ECDHE_PSK_NULL_SHA1 | -
 C03A | TLS_ECDHE_PSK_WITH_NULL_SHA256 | ECDHE-PSK-NULL-SHA256 | ECDHE_PSK_NULL_SHA256 | -
 C03B | TLS_ECDHE_PSK_WITH_NULL_SHA384 | ECDHE-PSK-NULL-SHA384 | ECDHE_PSK_NULL_SHA384 | -
 C03C | TLS_RSA_WITH_ARIA_128_CBC_SHA256 | - | - | -
 C03D | TLS_RSA_WITH_ARIA_256_CBC_SHA384 | - | - | -
 C03E | TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256 | - | - | -
@@ -262,88 +262,88 @@
 C06D | TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384 | DHE-PSK-ARIA256-GCM-SHA384 | - | -
 C06E | TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256 | RSA-PSK-ARIA128-GCM-SHA256 | - | -
 C06F | TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384 | RSA-PSK-ARIA256-GCM-SHA384 | - | -
 C070 | TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256 | - | - | -
 C071 | TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384 | - | - | -
-C072 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 | ECDHE-ECDSA-CAMELLIA128-SHA256 | - | -
-C073 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 | ECDHE-ECDSA-CAMELLIA256-SHA384 | - | -
+C072 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 | ECDHE-ECDSA-CAMELLIA128-SHA256 | ECDHE_ECDSA_CAMELLIA_128_CBC_SHA256 | -
+C073 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 | ECDHE-ECDSA-CAMELLIA256-SHA384 | ECDHE_ECDSA_CAMELLIA_256_CBC_SHA384 | -
 C074 | TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 | ECDH-ECDSA-CAMELLIA128-SHA256 | - | -
 C075 | TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 | ECDH-ECDSA-CAMELLIA256-SHA384 | - | -
-C076 | TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 | ECDHE-RSA-CAMELLIA128-SHA256 | - | -
-C077 | TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 | ECDHE-RSA-CAMELLIA256-SHA384 | - | -
+C076 | TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 | ECDHE-RSA-CAMELLIA128-SHA256 | ECDHE_RSA_CAMELLIA_128_CBC_SHA256 | -
+C077 | TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 | ECDHE-RSA-CAMELLIA256-SHA384 | ECDHE_RSA_CAMELLIA_256_CBC_SHA384 | -
 C078 | TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256 | ECDH-RSA-CAMELLIA128-SHA256 | - | -
 C079 | TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384 | ECDH-RSA-CAMELLIA256-SHA384 | - | -
-C07A | TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C07B | TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C07C | TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C07D | TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
+C07A | TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | RSA_CAMELLIA_128_GCM_SHA256 | -
+C07B | TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | RSA_CAMELLIA_256_GCM_SHA384 | -
+C07C | TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | DHE_RSA_CAMELLIA_128_GCM_SHA256 | -
+C07D | TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | DHE_RSA_CAMELLIA_256_GCM_SHA384 | -
 C07E | TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
 C07F | TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C080 | TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C081 | TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
+C080 | TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256 | - | DHE_DSS_CAMELLIA_128_GCM_SHA256 | -
+C081 | TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384 | - | DHE_DSS_CAMELLIA_256_GCM_SHA384 | -
 C082 | TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
 C083 | TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C084 | TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C085 | TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C086 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C087 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
+C084 | TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256 | - | DH_ANON_CAMELLIA_128_GCM_SHA256 | -
+C085 | TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384 | - | DH_ANON_CAMELLIA_256_GCM_SHA384 | -
+C086 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 | - | ECDHE_ECDSA_CAMELLIA_128_GCM_SHA256 | -
+C087 | TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 | - | ECDHE_ECDSA_CAMELLIA_256_GCM_SHA384 | -
 C088 | TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
 C089 | TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C08A | TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C08B | TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
+C08A | TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | ECDHE_RSA_CAMELLIA_128_GCM_SHA256 | -
+C08B | TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | ECDHE_RSA_CAMELLIA_256_GCM_SHA384 | -
 C08C | TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
 C08D | TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C08E | TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C08F | TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C090 | TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C091 | TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C092 | TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256 | - | - | -
-C093 | TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384 | - | - | -
-C094 | TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 | PSK-CAMELLIA128-SHA256 | - | -
-C095 | TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384 | PSK-CAMELLIA256-SHA384 | - | -
-C096 | TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 | DHE-PSK-CAMELLIA128-SHA256 | - | -
-C097 | TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 | DHE-PSK-CAMELLIA256-SHA384 | - | -
-C098 | TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 | RSA-PSK-CAMELLIA128-SHA256 | - | -
-C099 | TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 | RSA-PSK-CAMELLIA256-SHA384 | - | -
-C09A | TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 | ECDHE-PSK-CAMELLIA128-SHA256 | - | -
-C09B | TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 | ECDHE-PSK-CAMELLIA256-SHA384 | - | -
+C08E | TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 | - | PSK_CAMELLIA_128_GCM_SHA256 | -
+C08F | TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384 | - | PSK_CAMELLIA_256_GCM_SHA384 | -
+C090 | TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256 | - | DHE_PSK_CAMELLIA_128_GCM_SHA256 | -
+C091 | TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384 | - | DHE_PSK_CAMELLIA_256_GCM_SHA384 | -
+C092 | TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256 | - | RSA_PSK_CAMELLIA_128_GCM_SHA256 | -
+C093 | TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384 | - | RSA_PSK_CAMELLIA_256_GCM_SHA384 | -
+C094 | TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 | PSK-CAMELLIA128-SHA256 | PSK_CAMELLIA_128_CBC_SHA256 | -
+C095 | TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384 | PSK-CAMELLIA256-SHA384 | PSK_CAMELLIA_256_CBC_SHA384 | -
+C096 | TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 | DHE-PSK-CAMELLIA128-SHA256 | DHE_PSK_CAMELLIA_128_CBC_SHA256 | -
+C097 | TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 | DHE-PSK-CAMELLIA256-SHA384 | DHE_PSK_CAMELLIA_256_CBC_SHA384 | -
+C098 | TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 | RSA-PSK-CAMELLIA128-SHA256 | RSA_PSK_CAMELLIA_128_CBC_SHA256 | -
+C099 | TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 | RSA-PSK-CAMELLIA256-SHA384 | RSA_PSK_CAMELLIA_256_CBC_SHA384 | -
+C09A | TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 | ECDHE-PSK-CAMELLIA128-SHA256 | ECDHE_PSK_CAMELLIA_128_CBC_SHA256 | -
+C09B | TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 | ECDHE-PSK-CAMELLIA256-SHA384 | ECDHE_PSK_CAMELLIA_256_CBC_SHA384 | -
 C09C | TLS_RSA_WITH_AES_128_CCM | AES128-CCM | RSA_AES_128_CCM | -
 C09D | TLS_RSA_WITH_AES_256_CCM | AES256-CCM | RSA_AES_256_CCM | -
-C09E | TLS_DHE_RSA_WITH_AES_128_CCM | DHE-RSA-AES128-CCM | - | -
-C09F | TLS_DHE_RSA_WITH_AES_256_CCM | DHE-RSA-AES256-CCM | - | -
+C09E | TLS_DHE_RSA_WITH_AES_128_CCM | DHE-RSA-AES128-CCM | DHE_RSA_AES_128_CCM | -
+C09F | TLS_DHE_RSA_WITH_AES_256_CCM | DHE-RSA-AES256-CCM | DHE_RSA_AES_256_CCM | -
 C0A0 | TLS_RSA_WITH_AES_128_CCM_8 | AES128-CCM8 | RSA_AES_128_CCM_8 | -
 C0A1 | TLS_RSA_WITH_AES_256_CCM_8 | AES256-CCM8 | RSA_AES_256_CCM_8 | -
-C0A2 | TLS_DHE_RSA_WITH_AES_128_CCM_8 | DHE-RSA-AES128-CCM8 | - | -
-C0A3 | TLS_DHE_RSA_WITH_AES_256_CCM_8 | DHE-RSA-AES256-CCM8 | - | -
+C0A2 | TLS_DHE_RSA_WITH_AES_128_CCM_8 | DHE-RSA-AES128-CCM8 | DHE_RSA_AES_128_CCM_8 | -
+C0A3 | TLS_DHE_RSA_WITH_AES_256_CCM_8 | DHE-RSA-AES256-CCM8 | DHE_RSA_AES_256_CCM_8 | -
 C0A4 | TLS_PSK_WITH_AES_128_CCM | PSK-AES128-CCM | PSK_AES_128_CCM | -
 C0A5 | TLS_PSK_WITH_AES_256_CCM | PSK-AES256-CCM | PSK_AES_256_CCM | -
-C0A6 | TLS_DHE_PSK_WITH_AES_128_CCM | DHE-PSK-AES128-CCM | - | -
-C0A7 | TLS_DHE_PSK_WITH_AES_256_CCM | DHE-PSK-AES256-CCM | - | -
+C0A6 | TLS_DHE_PSK_WITH_AES_128_CCM | DHE-PSK-AES128-CCM | DHE_PSK_AES_128_CCM | -
+C0A7 | TLS_DHE_PSK_WITH_AES_256_CCM | DHE-PSK-AES256-CCM | DHE_PSK_AES_256_CCM | -
 C0A8 | TLS_PSK_WITH_AES_128_CCM_8 | PSK-AES128-CCM8 | PSK_AES_128_CCM_8 | -
 C0A9 | TLS_PSK_WITH_AES_256_CCM_8 | PSK-AES256-CCM8 | PSK_AES_256_CCM_8 | -
-C0AA | TLS_PSK_DHE_WITH_AES_128_CCM_8 | DHE-PSK-AES128-CCM8 | - | -
-C0AB | TLS_PSK_DHE_WITH_AES_256_CCM_8 | DHE-PSK-AES256-CCM8 | - | -
-C0AC | TLS_ECDHE_ECDSA_WITH_AES_128_CCM | ECDHE-ECDSA-AES128-CCM | - | -
-C0AD | TLS_ECDHE_ECDSA_WITH_AES_256_CCM | ECDHE-ECDSA-AES256-CCM | - | -
-C0AE | TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 | ECDHE-ECDSA-AES128-CCM8 | - | -
-C0AF | TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8 | ECDHE-ECDSA-AES256-CCM8 | - | -
+C0AA | TLS_PSK_DHE_WITH_AES_128_CCM_8 | DHE-PSK-AES128-CCM8 | DHE_PSK_AES_128_CCM_8 | -
+C0AB | TLS_PSK_DHE_WITH_AES_256_CCM_8 | DHE-PSK-AES256-CCM8 | DHE_PSK_AES_256_CCM_8 | -
+C0AC | TLS_ECDHE_ECDSA_WITH_AES_128_CCM | ECDHE-ECDSA-AES128-CCM | ECDHE_ECDSA_AES_128_CCM | -
+C0AD | TLS_ECDHE_ECDSA_WITH_AES_256_CCM | ECDHE-ECDSA-AES256-CCM | ECDHE_ECDSA_AES_256_CCM | -
+C0AE | TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 | ECDHE-ECDSA-AES128-CCM8 | ECDHE_ECDSA_AES_128_CCM_8 | -
+C0AF | TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8 | ECDHE-ECDSA-AES256-CCM8 | ECDHE_ECDSA_AES_256_CCM_8 | -
 C0B0 | TLS_ECCPWD_WITH_AES_128_GCM_SHA256 | - | - | -
 C0B1 | TLS_ECCPWD_WITH_AES_256_GCM_SHA384 | - | - | -
 C0B2 | TLS_ECCPWD_WITH_AES_128_CCM_SHA256 | - | - | -
 C0B3 | TLS_ECCPWD_WITH_AES_256_CCM_SHA384 | - | - | -
 C0B4 | TLS_SHA256_SHA256 | - | - | -
 C0B5 | TLS_SHA384_SHA384 | - | - | -
 C100 | TLS_GOSTR341112_256_WITH_KUZNYECHIK_CTR_OMAC | - | - | -
 C101 | TLS_GOSTR341112_256_WITH_MAGMA_CTR_OMAC | - | - | -
-C102 | TLS_GOSTR341112_256_WITH_28147_CNT_IMIT | - | - | -
+C102 | TLS_GOSTR341112_256_WITH_28147_CNT_IMIT | - | GOSTR341112_256_28147_CNT_IMIT | -
 C103 | TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_L | - | - | -
 C104 | TLS_GOSTR341112_256_WITH_MAGMA_MGM_L | - | - | -
 C105 | TLS_GOSTR341112_256_WITH_KUZNYECHIK_MGM_S | - | - | -
 C106 | TLS_GOSTR341112_256_WITH_MAGMA_MGM_S | - | - | -
-CCA8 | TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 | ECDHE-RSA-CHACHA20-POLY1305 | - | TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+CCA8 | TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 | ECDHE-RSA-CHACHA20-POLY1305 | ECDHE_RSA_CHACHA20_POLY1305 | TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
 CCA9 | TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 | ECDHE-ECDSA-CHACHA20-POLY1305 | ECDHE_ECDSA_CHACHA20_POLY1305 | TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
 CCAA | TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 | DHE-RSA-CHACHA20-POLY1305 | DHE_RSA_CHACHA20_POLY1305 | TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-CCAB | TLS_PSK_WITH_CHACHA20_POLY1305_SHA256 | PSK-CHACHA20-POLY1305 | - | -
+CCAB | TLS_PSK_WITH_CHACHA20_POLY1305_SHA256 | PSK-CHACHA20-POLY1305 | PSK_CHACHA20_POLY1305 | -
 CCAC | TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 | ECDHE-PSK-CHACHA20-POLY1305 | ECDHE_PSK_CHACHA20_POLY1305 | TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256
 CCAD | TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256 | DHE-PSK-CHACHA20-POLY1305 | DHE_PSK_CHACHA20_POLY1305 | TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256
 CCAE | TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256 | RSA-PSK-CHACHA20-POLY1305 | RSA_PSK_CHACHA20_POLY1305 | -
 D001 | TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256 | - | - | TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256
 D002 | TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384 | - | - | TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384