diff --git a/openssl-rfc.mappping.html b/openssl-rfc.mapping.html
similarity index 95%
rename from openssl-rfc.mappping.html
rename to openssl-rfc.mapping.html
index 85dbfa9..6fb7098 100644
--- a/openssl-rfc.mappping.html
+++ b/openssl-rfc.mapping.html
@@ -37,13 +37,13 @@ td { border:1px solid #999; }
- [0x00] | NULL-MD5 | RSA(512) | None | None, export | TLS_NULL_WITH_NULL_NULL |
- [0x01] | NULL-MD5 | RSA | None | None | TLS_RSA_WITH_NULL_MD5 |
- [0x02] | NULL-SHA | RSA | None | None | TLS_RSA_WITH_NULL_SHA |
- [0x03] | EXP-RC4-MD5 | RSA(512) | RC4 | 40, export | TLS_RSA_EXPORT_WITH_RC4_40_MD5 |
+ [0x00] | | None | Null | 0 | TLS_NULL_WITH_NULL_NULL |
+ [0x01] | NULL-MD5 | RSA | Null | 0 | TLS_RSA_WITH_NULL_MD5 |
+ [0x02] | NULL-SHA | RSA | Null | 0 | TLS_RSA_WITH_NULL_SHA |
+ [0x03] | EXP-RC4-MD5 | RSA(512) | RC4 | 40, export | TLS_RSA_EXPORT_WITH_RC4_40_MD5 |
[0x04] | RC4-MD5 | RSA | RC4 | 128 | TLS_RSA_WITH_RC4_128_MD5 |
[0x05] | RC4-SHA | RSA | RC4 | 128 | TLS_RSA_WITH_RC4_128_SHA |
- [0x06] | EXP-RC2-CBC-MD5 | RSA(512) | RC2 | 40, export | TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 |
+ [0x06] | EXP-RC2-CBC-MD5 | RSA(512) | RC2 | 40, export | TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 |
[0x07] | IDEA-CBC-SHA | RSA | IDEA | 128 | TLS_RSA_WITH_IDEA_CBC_SHA |
[0x08] | EXP-DES-CBC-SHA | RSA(512) | DES | 40, export | TLS_RSA_EXPORT_WITH_DES40_CBC_SHA |
[0x09] | DES-CBC-SHA | RSA | DES | 56 | TLS_RSA_WITH_DES_CBC_SHA |
@@ -67,7 +67,7 @@ td { border:1px solid #999; }
[0x1b] | ADH-DES-CBC3-SHA | DH | 3DES | 168 | TLS_DH_anon_WITH_3DES_EDE_CBC_SHA |
- [0x1c] | | FORTEZZA | None | None | SSL_FORTEZZA_KEA_WITH_NULL_SHA |
+ [0x1c] | | FORTEZZA | Null | 0 | SSL_FORTEZZA_KEA_WITH_NULL_SHA |
[0x1d] | | FORTEZZA | FORTEZZA_CBC | 80 | SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA |
[0x1e] | | FORTEZZA | FORTEZZA_RC4 | 128 | SSL_FORTEZZA_KEA_WITH_RC4_128_SHA |
@@ -88,9 +88,9 @@ td { border:1px solid #999; }
[0x2b] | EXP-KRB5-RC4-MD5 | KRB5 | RC4 | 40, export | TLS_KRB5_EXPORT_WITH_RC4_40_MD5 |
- [0x2c] | PSK-NULL-SHA | PSK | None | None | TLS_PSK_WITH_NULL_SHA |
- [0x2d] | DHE-PSK-NULL-SHA | DH/PSK | None | None | TLS_DHE_PSK_WITH_NULL_SHA |
- [0x2e] | RSA-PSK-NULL-SHA | RSA/PSK | None | None | TLS_RSA_PSK_WITH_NULL_SHA |
+ [0x2c] | PSK-NULL-SHA | PSK | Null | 0 | TLS_PSK_WITH_NULL_SHA |
+ [0x2d] | DHE-PSK-NULL-SHA | DH/PSK | Null | 0 | TLS_DHE_PSK_WITH_NULL_SHA |
+ [0x2e] | RSA-PSK-NULL-SHA | RSA/PSK | Null | 0 | TLS_RSA_PSK_WITH_NULL_SHA |
[0x2f] | AES128-SHA | RSA | AES | 128 | TLS_RSA_WITH_AES_128_CBC_SHA |
@@ -105,7 +105,7 @@ td { border:1px solid #999; }
[0x38] | DHE-DSS-AES256-SHA | DH | AES | 256 | TLS_DHE_DSS_WITH_AES_256_CBC_SHA |
[0x39] | DHE-RSA-AES256-SHA | DH | AES | 256 | TLS_DHE_RSA_WITH_AES_256_CBC_SHA |
[0x3a] | ADH-AES256-SHA | DH | AES | 256 | TLS_DH_anon_WITH_AES_256_CBC_SHA |
- [0x3b] | NULL-SHA256 | RSA | None | None | TLS_RSA_WITH_NULL_SHA256 |
+ [0x3b] | NULL-SHA256 | RSA | Null | 0 | TLS_RSA_WITH_NULL_SHA256 |
[0x3c] | AES128-SHA256 | RSA | AES | 128 | TLS_RSA_WITH_AES_128_CBC_SHA256 |
[0x3d] | AES256-SHA256 | RSA | AES | 256 | TLS_RSA_WITH_AES_256_CBC_SHA256 |
[0x3e] | DH-DSS-AES128-SHA256 | DH/DSS | AES | 128 | TLS_DH_DSS_WITH_AES_128_CBC_SHA256 |
@@ -138,8 +138,8 @@ td { border:1px solid #999; }
[0x80] | GOST94-GOST89-GOST89 | VKO GOST 34.10-94 | GOST89 | 256 | TLS_GOSTR341094_WITH_28147_CNT_IMIT |
[0x81] | GOST2001-GOST89-GOST89 | VKO GOST 34.10-2001 | GOST89 | 256 | TLS_GOSTR341001_WITH_28147_CNT_IMIT |
- [0x82] | GOST94-NULL-GOST94 | VKO GOST 34.10-94 | eNULL | None | TLS_GOSTR341001_WITH_NULL_GOSTR3411 |
- [0x83] | GOST2001-GOST89-GOST89 | VKO GOST 34.10-2001 | eNULL | None | TLS_GOSTR341094_WITH_NULL_GOSTR3411 |
+ [0x82] | GOST94-NULL-GOST94 | VKO GOST 34.10-94 | Null | 0 | TLS_GOSTR341001_WITH_NULL_GOSTR3411 |
+ [0x83] | GOST2001-GOST89-GOST89 | VKO GOST 34.10-2001 | Null | 0 | TLS_GOSTR341094_WITH_NULL_GOSTR3411 |
[0x84] | CAMELLIA256-SHA | RSA | Camellia | 256 | TLS_RSA_WITH_CAMELLIA_256_CBC_SHA |
@@ -226,27 +226,27 @@ xB9 TLS_RSA_PSK_WITH_NULL_SHA384
[0x5600] | TLS_FALLBACK_SCSV | | | | TLS_EMPTY_RENEGOTIATION_INFO_SCSV |
- [0xc001] | ECDH-ECDSA-NULL-SHA | ECDH/ECDSA | None | None | TLS_ECDH_ECDSA_WITH_NULL_SHA |
+ [0xc001] | ECDH-ECDSA-NULL-SHA | ECDH/ECDSA | Null | 0 | TLS_ECDH_ECDSA_WITH_NULL_SHA |
[0xc002] | ECDH-ECDSA-RC4-SHA | ECDH/ECDSA | RC4 | 128 | TLS_ECDH_ECDSA_WITH_RC4_128_SHA |
[0xc003] | ECDH-ECDSA-DES-CBC3-SHA | ECDH/ECDSA | 3DES | 168 | TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA |
[0xc004] | ECDH-ECDSA-AES128-SHA | ECDH/ECDSA | AES | 128 | TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA |
[0xc005] | ECDH-ECDSA-AES256-SHA | ECDH/ECDSA | AES | 256 | TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA |
- [0xc006] | ECDHE-ECDSA-NULL-SHA | ECDH | None | None | TLS_ECDHE_ECDSA_WITH_NULL_SHA |
+ [0xc006] | ECDHE-ECDSA-NULL-SHA | ECDH | Null | 0 | TLS_ECDHE_ECDSA_WITH_NULL_SHA |
[0xc007] | ECDHE-ECDSA-RC4-SHA | ECDH | RC4 | 128 | TLS_ECDHE_ECDSA_WITH_RC4_128_SHA |
[0xc008] | ECDHE-ECDSA-DES-CBC3-SHA | ECDH | 3DES | 168 | TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA |
[0xc009] | ECDHE-ECDSA-AES128-SHA | ECDH | AES | 128 | TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA |
[0xc00a] | ECDHE-ECDSA-AES256-SHA | ECDH | AES | 256 | TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA |
- [0xc00b] | ECDH-RSA-NULL-SHA | ECDH/RSA | None | None | TLS_ECDH_RSA_WITH_NULL_SHA |
+ [0xc00b] | ECDH-RSA-NULL-SHA | ECDH/RSA | Null | 0 | TLS_ECDH_RSA_WITH_NULL_SHA |
[0xc00c] | ECDH-RSA-RC4-SHA | ECDH/RSA | RC4 | 128 | TLS_ECDH_RSA_WITH_RC4_128_SHA |
[0xc00d] | ECDH-RSA-DES-CBC3-SHA | ECDH/RSA | 3DES | 168 | TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA |
[0xc00e] | ECDH-RSA-AES128-SHA | ECDH/RSA | AES | 128 | TLS_ECDH_RSA_WITH_AES_128_CBC_SHA |
[0xc00f] | ECDH-RSA-AES256-SHA | ECDH/RSA | AES | 256 | TLS_ECDH_RSA_WITH_AES_256_CBC_SHA |
- [0xc010] | ECDHE-RSA-NULL-SHA | ECDH | None | None | TLS_ECDHE_RSA_WITH_NULL_SHA |
+ [0xc010] | ECDHE-RSA-NULL-SHA | ECDH | Null | 0 | TLS_ECDHE_RSA_WITH_NULL_SHA |
[0xc011] | ECDHE-RSA-RC4-SHA | ECDH | RC4 | 128 | TLS_ECDHE_RSA_WITH_RC4_128_SHA |
[0xc012] | ECDHE-RSA-DES-CBC3-SHA | ECDH | 3DES | 168 | TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA |
[0xc013] | ECDHE-RSA-AES128-SHA | ECDH | AES | 128 | TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA |
[0xc014] | ECDHE-RSA-AES256-SHA | ECDH | AES | 256 | TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA |
- [0xc015] | AECDH-NULL-SHA | ECDH | None | None | TLS_ECDH_anon_WITH_NULL_SHA |
+ [0xc015] | AECDH-NULL-SHA | ECDH | Null | 0 | TLS_ECDH_anon_WITH_NULL_SHA |
[0xc016] | AECDH-RC4-SHA | ECDH | RC4 | 128 | TLS_ECDH_anon_WITH_RC4_128_SHA |
[0xc017] | AECDH-DES-CBC3-SHA | ECDH | 3DES | 168 | TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA |
[0xc018] | AECDH-AES128-SHA | ECDH | AES | 128 | TLS_ECDH_anon_WITH_AES_128_CBC_SHA |
@@ -288,9 +288,9 @@ xB9 TLS_RSA_PSK_WITH_NULL_SHA384
[0xc036] | ECDHE-PSK-AES256-CBC-SHA | PSK/ECDHE | AES | 256 | TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA |
[0xc037] | ECDHE-PSK-AES128-CBC-SHA256 | PSK/ECDHE | AES | 128 | TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256 |
[0xc038] | ECDHE-PSK-AES256-CBC-SHA384 | PSK/ECDHE | AES | 256 | TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384 |
- [0xc039] | ECDHE-PSK-NULL-SHA | PSK/ECDHE | None | None | TLS_ECDHE_PSK_WITH_NULL_SHA |
- [0xc03A] | ECDHE-PSK-NULL-SHA256 | PSK/ECDHE | None | None | TLS_ECDHE_PSK_WITH_NULL_SHA256 |
- [0xc03B] | ECDHE-PSK-NULL-SHA384 | PSK/ECDHE | None | None | TLS_ECDHE_PSK_WITH_NULL_SHA384 |
+ [0xc039] | ECDHE-PSK-NULL-SHA | PSK/ECDHE | Null | 0 | TLS_ECDHE_PSK_WITH_NULL_SHA |
+ [0xc03A] | ECDHE-PSK-NULL-SHA256 | PSK/ECDHE | Null | 0 | TLS_ECDHE_PSK_WITH_NULL_SHA256 |
+ [0xc03B] | ECDHE-PSK-NULL-SHA384 | PSK/ECDHE | Null | 0 | TLS_ECDHE_PSK_WITH_NULL_SHA384 |
[0xc03C] | | | | | TLS_RSA_WITH_ARIA_128_CBC_SHA256 |
@@ -433,29 +433,26 @@ xB9 TLS_RSA_PSK_WITH_NULL_SHA384
[0xfee0] | | RSA | 3DES | 168 | SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA |
[0xfee1] | | RSA | DES | 56 | SSL_RSA_FIPS_WITH_DES_CBC_SHA |
+
+
[0x010080] | RC4-MD5 | RSA | RC4 | 128 | SSL_CK_RC4_128_WITH_MD5 |
[0x020080] | EXP-RC4-MD5 | RSA(512) | RC4 | 40, export | SSL_CK_RC4_128_EXPORT40_WITH_MD5 |
-
[0x030080] | RC2-CBC-MD5 | RSA | RC2 | 128 | SSL_CK_RC2_128_CBC_WITH_MD5 |
[0x040080] | EXP-RC2-CBC-MD5 | RSA(512) | RC2 | 40, export | SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5 |
[0x050080] | IDEA-CBC-MD5 | RSA | IDEA | 128 | SSL_CK_IDEA_128_CBC_WITH_MD5 |
[0x060040] | DES-CBC-MD5 | RSA | DES | 56 | SSL_CK_DES_64_CBC_WITH_MD5 |
+ [0x060140] | DES-CBC-SHA | RSA | DES | 56 | SSL_CK_DES_64_CBC_WITH_SHA |
[0x0700c0] | DES-CBC3-MD5 | RSA | 3DES | 168 | SSL_CK_DES_192_EDE3_CBC_WITH_MD5 |
+ [0x0701c0] | DES-CBC3-SHA | RSA | 3DES | 168 | SSL_CK_DES_192_EDE3_CBC_WITH_SHA |
[0x080080] | RC4-64-MD5 | RSA | RC4 | 64 | SSL_CK_RC4_64_WITH_MD5 |
+
+ [0xff0800] | DES-CFB-M1 | RSA | DES | 64 | SSL_CK_DES_64_CFB64_WITH_MD5_1 |
+ [0xff0810] | NULL | None | Null | 0 | SSL_CK_NULL |