#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+
#ifdef HAVE_LIBZ
#include <zlib.h>
#endif
+
#include "packet-ssl-utils.h"
#include <epan/emem.h>
#include <epan/strutil.h>
+#include <epan/addr_resolv.h>
+#include <epan/ipv6-utils.h>
#include <wsutil/file_util.h>
/*
* Lookup tables
- *
*/
+const value_string ssl_version_short_names[] = {
+ { SSL_VER_UNKNOWN, "SSL" },
+ { SSL_VER_SSLv2, "SSLv2" },
+ { SSL_VER_SSLv3, "SSLv3" },
+ { SSL_VER_TLS, "TLSv1" },
+ { SSL_VER_TLSv1DOT1, "TLSv1.1" },
+ { SSL_VER_DTLS, "DTLSv1.0" },
+ { SSL_VER_PCT, "PCT" },
+ { SSL_VER_TLSv1DOT2, "TLSv1.2" },
+ { 0x00, NULL }
+};
+
const value_string ssl_20_msg_types[] = {
{ SSL2_HND_ERROR, "Error" },
{ SSL2_HND_CLIENT_HELLO, "Client Hello" },
{ SSL2_HND_CLIENT_CERTIFICATE, "Client Certificate" },
{ 0x00, NULL }
};
-
-const value_string ssl_20_cipher_suites[] = {
- { 0x010080, "SSL2_RC4_128_WITH_MD5" },
- { 0x020080, "SSL2_RC4_128_EXPORT40_WITH_MD5" },
- { 0x030080, "SSL2_RC2_CBC_128_CBC_WITH_MD5" },
- { 0x040080, "SSL2_RC2_CBC_128_CBC_WITH_MD5" },
- { 0x050080, "SSL2_IDEA_128_CBC_WITH_MD5" },
- { 0x060040, "SSL2_DES_64_CBC_WITH_MD5" },
- { 0x0700c0, "SSL2_DES_192_EDE3_CBC_WITH_MD5" },
- { 0x080080, "SSL2_RC4_64_WITH_MD5" },
+/* http://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml */
+/* Note: sorted by ascending value so value_string-ext can do a binary search */
+static const value_string ssl_20_cipher_suites[] = {
{ 0x000000, "TLS_NULL_WITH_NULL_NULL" },
{ 0x000001, "TLS_RSA_WITH_NULL_MD5" },
{ 0x000002, "TLS_RSA_WITH_NULL_SHA" },
{ 0x00001b, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA" },
{ 0x00001c, "SSL_FORTEZZA_KEA_WITH_NULL_SHA" },
{ 0x00001d, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA" },
+#if 0
{ 0x00001e, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA" },
+#endif
+ /* RFC 2712 */
+ { 0x00001E, "TLS_KRB5_WITH_DES_CBC_SHA" },
+ { 0x00001F, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA" },
+ { 0x000020, "TLS_KRB5_WITH_RC4_128_SHA" },
+ { 0x000021, "TLS_KRB5_WITH_IDEA_CBC_SHA" },
+ { 0x000022, "TLS_KRB5_WITH_DES_CBC_MD5" },
+ { 0x000023, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5" },
+ { 0x000024, "TLS_KRB5_WITH_RC4_128_MD5" },
+ { 0x000025, "TLS_KRB5_WITH_IDEA_CBC_MD5" },
+ { 0x000026, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA" },
+ { 0x000027, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA" },
+ { 0x000028, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA" },
+ { 0x000029, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5" },
+ { 0x00002A, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5" },
+ { 0x00002B, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5" },
+ /* RFC 4785 */
+ { 0x00002C, "TLS_PSK_WITH_NULL_SHA" },
+ { 0x00002D, "TLS_DHE_PSK_WITH_NULL_SHA" },
+ { 0x00002E, "TLS_RSA_PSK_WITH_NULL_SHA" },
+ /* RFC 5246 */
{ 0x00002f, "TLS_RSA_WITH_AES_128_CBC_SHA" },
{ 0x000030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA" },
{ 0x000031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA" },
{ 0x000038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA" },
{ 0x000039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA" },
{ 0x00003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA" },
+ { 0x00003B, "TLS_RSA_WITH_NULL_SHA256" },
+ { 0x00003C, "TLS_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x00003D, "TLS_RSA_WITH_AES_256_CBC_SHA256" },
+ { 0x00003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256" },
+ { 0x00003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x000040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256" },
{ 0x000041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA" },
{ 0x000042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA" },
{ 0x000043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA" },
{ 0x000064, "TLS_RSA_EXPORT1024_WITH_RC4_56_SHA" },
{ 0x000065, "TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA" },
{ 0x000066, "TLS_DHE_DSS_WITH_RC4_128_SHA" },
+ { 0x000067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x000068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256" },
+ { 0x000069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256" },
+ { 0x00006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" },
+ { 0x00006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256" },
+ { 0x00006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256" },
+ { 0x00006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256" },
+ /* 0x00,0x6E-83 Unassigned */
{ 0x000084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x000085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x000086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x000087, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x000088, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x000089, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA" },
+ /* RFC 4279 */
+ { 0x00008A, "TLS_PSK_WITH_RC4_128_SHA" },
+ { 0x00008B, "TLS_PSK_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00008C, "TLS_PSK_WITH_AES_128_CBC_SHA" },
+ { 0x00008D, "TLS_PSK_WITH_AES_256_CBC_SHA" },
+ { 0x00008E, "TLS_DHE_PSK_WITH_RC4_128_SHA" },
+ { 0x00008F, "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+ { 0x000090, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA" },
+ { 0x000091, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA" },
+ { 0x000092, "TLS_RSA_PSK_WITH_RC4_128_SHA" },
+ { 0x000093, "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA" },
+ { 0x000094, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA" },
+ { 0x000095, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA" },
+ /* RFC 4162 */
+ { 0x000096, "TLS_RSA_WITH_SEED_CBC_SHA" },
+ { 0x000097, "TLS_DH_DSS_WITH_SEED_CBC_SHA" },
+ { 0x000098, "TLS_DH_RSA_WITH_SEED_CBC_SHA" },
+ { 0x000099, "TLS_DHE_DSS_WITH_SEED_CBC_SHA" },
+ { 0x00009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA" },
+ { 0x00009B, "TLS_DH_anon_WITH_SEED_CBC_SHA" },
+ /* RFC 5288 */
+ { 0x00009C, "TLS_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x00009D, "TLS_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x00009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x00009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x0000A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x0000A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x0000A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256" },
+ { 0x0000A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384" },
+ { 0x0000A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256" },
+ { 0x0000A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384" },
+ { 0x0000A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256" },
+ { 0x0000A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384" },
+ /* RFC 5487 */
+ { 0x0000A8, "TLS_PSK_WITH_AES_128_GCM_SHA256" },
+ { 0x0000A9, "TLS_PSK_WITH_AES_256_GCM_SHA384" },
+ { 0x0000AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256" },
+ { 0x0000AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384" },
+ { 0x0000AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256" },
+ { 0x0000AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384" },
+ { 0x0000AE, "TLS_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0x0000AF, "TLS_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0x0000B0, "TLS_PSK_WITH_NULL_SHA256" },
+ { 0x0000B1, "TLS_PSK_WITH_NULL_SHA384" },
+ { 0x0000B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0x0000B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0x0000B4, "TLS_DHE_PSK_WITH_NULL_SHA256" },
+ { 0x0000B5, "TLS_DHE_PSK_WITH_NULL_SHA384" },
+ { 0x0000B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0x0000B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0x0000B8, "TLS_RSA_PSK_WITH_NULL_SHA256" },
+ { 0x0000B9, "TLS_RSA_PSK_WITH_NULL_SHA384" },
+ /* From RFC 5932 */
+ { 0x0000BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x0000BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x0000BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x0000BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x0000BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x0000BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x0000C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x0000C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x0000C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x0000C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x0000C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x0000C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256" },
+ /* 0x00,0xC6-FE Unassigned */
+ { 0x0000FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" },
+ /* 0x01-BF,* Unassigned */
+ /* From RFC 4492 */
+ { 0x00c001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" },
+ { 0x00c002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA" },
+ { 0x00c003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00c004, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA" },
+ { 0x00c005, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA" },
+ { 0x00c006, "TLS_ECDHE_ECDSA_WITH_NULL_SHA" },
+ { 0x00c007, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA" },
+ { 0x00c008, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00c009, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" },
+ { 0x00c00a, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" },
+ { 0x00c00b, "TLS_ECDH_RSA_WITH_NULL_SHA" },
+ { 0x00c00c, "TLS_ECDH_RSA_WITH_RC4_128_SHA" },
+ { 0x00c00d, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00c00e, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA" },
+ { 0x00c00f, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA" },
+ { 0x00c010, "TLS_ECDHE_RSA_WITH_NULL_SHA" },
+ { 0x00c011, "TLS_ECDHE_RSA_WITH_RC4_128_SHA" },
+ { 0x00c012, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00c013, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" },
+ { 0x00c014, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" },
+ { 0x00c015, "TLS_ECDH_anon_WITH_NULL_SHA" },
+ { 0x00c016, "TLS_ECDH_anon_WITH_RC4_128_SHA" },
+ { 0x00c017, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00c018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA" },
+ { 0x00c019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA" },
+ /* RFC 5054 */
+ { 0x00C01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00C01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00C01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00C01D, "TLS_SRP_SHA_WITH_AES_128_CBC_SHA" },
+ { 0x00C01E, "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA" },
+ { 0x00C01F, "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA" },
+ { 0x00C020, "TLS_SRP_SHA_WITH_AES_256_CBC_SHA" },
+ { 0x00C021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA" },
+ { 0x00C022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA" },
+ /* RFC 5589 */
+ { 0x00C023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" },
+ { 0x00C024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" },
+ { 0x00C025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256" },
+ { 0x00C026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384" },
+ { 0x00C027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x00C028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" },
+ { 0x00C029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x00C02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384" },
+ { 0x00C02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
+ { 0x00C02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
+ { 0x00C02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256" },
+ { 0x00C02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384" },
+ { 0x00C02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x00C030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x00C031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x00C032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
+ /* RFC 5489 */
+ { 0x00C033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA" },
+ { 0x00C034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+ { 0x00C035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },
+ { 0x00C036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" },
+ { 0x00C037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0x00C038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0x00C039, "TLS_ECDHE_PSK_WITH_NULL_SHA" },
+ { 0x00C03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" },
+ { 0x00C03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" },
+ /* 0xC0,0x3C-FF Unassigned
+ 0xC1-FD,* Unassigned
+ 0xFE,0x00-FD Unassigned
+ 0xFE,0xFE-FF Reserved to avoid conflicts with widely deployed implementations [Pasi_Eronen]
+ 0xFF,0x00-FF Reserved for Private Use [RFC5246]
+ */
+
/* these from http://www.mozilla.org/projects/
security/pki/nss/ssl/fips-ssl-ciphersuites.html */
{ 0x00fefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
{ 0x00feff, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA" },
{ 0x00ffe0, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA" },
{ 0x00ffe1, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
+ /* note that ciphersuites of {0x00????} are TLS cipher suites in
+ * a sslv2 client hello message; the ???? above is the two-byte
+ * tls cipher suite id
+ */
+
+ { 0x010080, "SSL2_RC4_128_WITH_MD5" },
+ { 0x020080, "SSL2_RC4_128_EXPORT40_WITH_MD5" },
+ { 0x030080, "SSL2_RC2_CBC_128_CBC_WITH_MD5" },
+ { 0x040080, "SSL2_RC2_CBC_128_CBC_WITH_MD5" },
+ { 0x050080, "SSL2_IDEA_128_CBC_WITH_MD5" },
+ { 0x060040, "SSL2_DES_64_CBC_WITH_MD5" },
+ { 0x0700c0, "SSL2_DES_192_EDE3_CBC_WITH_MD5" },
+ { 0x080080, "SSL2_RC4_64_WITH_MD5" },
+
/* Microsoft's old PCT protocol. These are from Eric Rescorla's
book "SSL and TLS" */
- { 0x8f8001, "PCT_SSL_COMPAT | PCT_VERSION_1" },
- { 0x800003, "PCT_SSL_CERT_TYPE | PCT1_CERT_X509_CHAIN" },
{ 0x800001, "PCT_SSL_CERT_TYPE | PCT1_CERT_X509" },
+ { 0x800003, "PCT_SSL_CERT_TYPE | PCT1_CERT_X509_CHAIN" },
{ 0x810001, "PCT_SSL_HASH_TYPE | PCT1_HASH_MD5" },
{ 0x810003, "PCT_SSL_HASH_TYPE | PCT1_HASH_SHA" },
{ 0x820001, "PCT_SSL_EXCH_TYPE | PCT1_EXCH_RSA_PKCS1" },
{ 0x830004, "PCT_SSL_CIPHER_TYPE_1ST_HALF | PCT1_CIPHER_RC4" },
- { 0x848040, "PCT_SSL_CIPHER_TYPE_2ND_HALF | PCT1_ENC_BITS_128 | PCT1_MAC_BITS_128" },
{ 0x842840, "PCT_SSL_CIPHER_TYPE_2ND_HALF | PCT1_ENC_BITS_40 | PCT1_MAC_BITS_128" },
- /* note that ciphersuites of {0x00????} are TLS cipher suites in
- * a sslv2 client hello message; the ???? above is the two-byte
- * tls cipher suite id
- */
+ { 0x848040, "PCT_SSL_CIPHER_TYPE_2ND_HALF | PCT1_ENC_BITS_128 | PCT1_MAC_BITS_128" },
+ { 0x8f8001, "PCT_SSL_COMPAT | PCT_VERSION_1" },
+ { 0x00, NULL }
+};
+
+value_string_ext ssl_20_cipher_suites_ext = VALUE_STRING_EXT_INIT(ssl_20_cipher_suites);
+
+
+const value_string ssl_extension_curves[] = {
+ { 1, "sect163k1" },
+ { 2, "sect163r1" },
+ { 3, "sect163r2" },
+ { 4, "sect193r1" },
+ { 5, "sect193r2" },
+ { 6, "sect233k1" },
+ { 7, "sect233r1" },
+ { 8, "sect239k1" },
+ { 9, "sect283k1" },
+ { 10, "sect283r1" },
+ { 11, "sect409k1" },
+ { 12, "sect409r1" },
+ { 13, "sect571k1" },
+ { 14, "sect571r1" },
+ { 15, "secp160k1" },
+ { 16, "secp160r1" },
+ { 17, "secp160r2" },
+ { 18, "secp192k1" },
+ { 19, "secp192r1" },
+ { 20, "secp224k1" },
+ { 21, "secp224r1" },
+ { 22, "secp256k1" },
+ { 23, "secp256r1" },
+ { 24, "secp384r1" },
+ { 25, "secp521r1" },
+ { 0xFF01, "arbitrary_explicit_prime_curves" },
+ { 0xFF02, "arbitrary_explicit_char2_curves" },
+ { 0x00, NULL }
+};
+
+const value_string ssl_extension_ec_point_formats[] = {
+ { 0, "uncompressed" },
+ { 1, "ansiX962_compressed_prime" },
+ { 2, "ansiX962_compressed_char2" },
{ 0x00, NULL }
};
const value_string ssl_versions[] = {
{ 0xfeff, "DTLS 1.0" },
{ 0x0100, "DTLS 1.0 (OpenSSL pre 0.9.8f)" },
+ { 0x0303, "TLS 1.2" },
{ 0x0302, "TLS 1.1" },
{ 0x0301, "TLS 1.0" },
{ 0x0300, "SSL 3.0" },
{ 22, "Record Overflow" },
{ 30, "Decompression Failure" },
{ 40, "Handshake Failure" },
+ { 41, "No Certificate" },
{ 42, "Bad Certificate" },
{ 43, "Unsupported Certificate" },
{ 44, "Certificate Revoked" },
{ 80, "Internal Error" },
{ 90, "User Canceled" },
{ 100, "No Renegotiation" },
+ { 110, "Unsupported Extension" },
+ { 111, "Certificate Unobtainable" },
+ { 112, "Unrecognized Name" },
+ { 113, "Bad Certificate Status Response" },
+ { 114, "Bad Certificate Hash Value" },
+ { 115, "Unknown PSK Identity" },
{ 0x00, NULL }
};
{ SSL_HND_CERT_VERIFY, "Certificate Verify" },
{ SSL_HND_CLIENT_KEY_EXCHG, "Client Key Exchange" },
{ SSL_HND_FINISHED, "Finished" },
+ { SSL_HND_CERT_STATUS, "Certificate Status" },
{ 0x00, NULL }
};
{ 2, "DSS Sign" },
{ 3, "RSA Fixed DH" },
{ 4, "DSS Fixed DH" },
+ { 64, "ECDSA Sign" },
+ { 65, "RSA Fixed ECDH" },
+ { 66, "ECDSA Fixed ECDH" },
{ 0x00, NULL }
};
};
#endif
-const value_string ssl_31_ciphersuite[] = {
- /* RFC 2246, RFC 4346 */
+/* http://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml */
+/* Note: sorted by ascending value so value_string_ext fcns can do a binary search */
+static const value_string ssl_31_ciphersuite[] = {
+ /* RFC 2246, RFC 4346, RFC 5246 */
{ 0x0000, "TLS_NULL_WITH_NULL_NULL" },
{ 0x0001, "TLS_RSA_WITH_NULL_MD5" },
{ 0x0002, "TLS_RSA_WITH_NULL_SHA" },
{ 0x001c, "SSL_FORTEZZA_KEA_WITH_NULL_SHA" },
{ 0x001d, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA" },
#if 0 /* Because it clashes with KRB5, is never used any more, and is safe
- to remove according to David Hopwood <david.hopwood@zetnet.co.uk>
- of the ietf-tls list */
+ to remove according to David Hopwood <david.hopwood@zetnet.co.uk>
+ of the ietf-tls list */
{ 0x001e, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA" },
#endif
{ 0x002D, "TLS_DHE_PSK_WITH_NULL_SHA" },
{ 0x002E, "TLS_RSA_PSK_WITH_NULL_SHA" },
- /* RFC 3268 */
+ /* RFC 5246 */
{ 0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA" },
{ 0x0030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA" },
{ 0x0031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA" },
{ 0x0038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA" },
{ 0x0039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA" },
{ 0x003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA" },
+ { 0x003B, "TLS_RSA_WITH_NULL_SHA256" },
+ { 0x003C, "TLS_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x003D, "TLS_RSA_WITH_AES_256_CBC_SHA256" },
+ { 0x003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256" },
+ { 0x003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x0040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256" },
- /* ??? */
+ /* RFC 4132 */
+ { 0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+ { 0x0042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA" },
+ { 0x0043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+ { 0x0044, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA" },
+ { 0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+ { 0x0046, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA" },
+
+ /* 0x00,0x60-66 Reserved to avoid conflicts with widely deployed implementations */
+ /* --- ??? --- */
{ 0x0060, "TLS_RSA_EXPORT1024_WITH_RC4_56_MD5" },
{ 0x0061, "TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5" },
-
/* draft-ietf-tls-56-bit-ciphersuites-01.txt */
{ 0x0062, "TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA" },
{ 0x0063, "TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA" },
{ 0x0064, "TLS_RSA_EXPORT1024_WITH_RC4_56_SHA" },
{ 0x0065, "TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA" },
{ 0x0066, "TLS_DHE_DSS_WITH_RC4_128_SHA" },
+ /* --- ??? ---*/
+
+ { 0x0067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x0068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256" },
+ { 0x0069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256" },
+ { 0x006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" },
+ { 0x006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256" },
+ { 0x006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256" },
+ { 0x006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256" },
+
/* RFC 4132 */
- { 0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0044, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0046, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA" },
{ 0x0084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x0085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x0086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA" },
{ 0x009B, "TLS_DH_anon_WITH_SEED_CBC_SHA" },
+ /* RFC 5288 */
+ { 0x009C, "TLS_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x009D, "TLS_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x00A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0x00A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x00A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256" },
+ { 0x00A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384" },
+ { 0x00A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256" },
+ { 0x00A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384" },
+ { 0x00A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256" },
+ { 0x00A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384" },
+
+ /* RFC 5487 */
+ { 0x00A8, "TLS_PSK_WITH_AES_128_GCM_SHA256" },
+ { 0x00A9, "TLS_PSK_WITH_AES_256_GCM_SHA384" },
+ { 0x00AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256" },
+ { 0x00AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384" },
+ { 0x00AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256" },
+ { 0x00AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384" },
+ { 0x00AE, "TLS_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0x00AF, "TLS_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0x00B0, "TLS_PSK_WITH_NULL_SHA256" },
+ { 0x00B1, "TLS_PSK_WITH_NULL_SHA384" },
+ { 0x00B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0x00B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0x00B4, "TLS_DHE_PSK_WITH_NULL_SHA256" },
+ { 0x00B5, "TLS_DHE_PSK_WITH_NULL_SHA384" },
+ { 0x00B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0x00B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0x00B8, "TLS_RSA_PSK_WITH_NULL_SHA256" },
+ { 0x00B9, "TLS_RSA_PSK_WITH_NULL_SHA384" },
+
+ /* From RFC 5932 */
+ { 0x00BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x00BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x00BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x00BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x00BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x00BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x00C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x00C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x00C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 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" },
+ /* 0x00,0xC6-FE Unassigned */
+ /* From RFC 5746 */
+ { 0x0000FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" },
+ /* 0x01-BF,* Unassigned */
/* From RFC 4492 */
{ 0xc001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" },
{ 0xc002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA" },
{ 0xc018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA" },
{ 0xc019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA" },
- /* draft-ietf-tls-srp-14.txt */
+ /* RFC 5054 */
{ 0xC01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA" },
{ 0xC01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA" },
{ 0xC01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA" },
{ 0xC021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA" },
{ 0xC022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA" },
+ /* RFC 5589 */
+ { 0xC023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" },
+ { 0xC024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" },
+ { 0xC025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256" },
+ { 0xC026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384" },
+ { 0xC027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0xC028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" },
+ { 0xC029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0xC02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384" },
+ { 0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
+ { 0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
+ { 0xC02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256" },
+ { 0xC02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384" },
+ { 0xC02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0xC030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
+ { 0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
+
+ /* RFC 5489 */
+ { 0xC033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA" },
+ { 0xC034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+ { 0xC035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },
+ { 0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" },
+ { 0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" },
+ { 0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" },
+ { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" },
+ { 0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" },
+ { 0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" },
+/*
+0xC0,0x3C-FF Unassigned
+0xC1-FD,* Unassigned
+0xFE,0x00-FD Unassigned
+0xFE,0xFE-FF Reserved to avoid conflicts with widely deployed implementations [Pasi_Eronen]
+0xFF,0x00-FF Reserved for Private Use [RFC5246]
+*/
/* these from http://www.mozilla.org/projects/
security/pki/nss/ssl/fips-ssl-ciphersuites.html */
{ 0xfefe, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
{ 0x00, NULL }
};
+value_string_ext ssl_31_ciphersuite_ext = VALUE_STRING_EXT_INIT(ssl_31_ciphersuite);
+
+
const value_string pct_msg_types[] = {
{ PCT_MSG_CLIENT_HELLO, "Client Hello" },
{ PCT_MSG_SERVER_HELLO, "Server Hello" },
};
const value_string pct_cipher_type[] = {
- { PCT_CIPHER_DES, "DES" },
- { PCT_CIPHER_IDEA, "IDEA" },
- { PCT_CIPHER_RC2, "RC2" },
- { PCT_CIPHER_RC4, "RC4" },
- { PCT_CIPHER_DES_112, "DES 112 bit" },
- { PCT_CIPHER_DES_168, "DES 168 bit" },
- { 0x00, NULL }
+ { PCT_CIPHER_DES, "DES" },
+ { PCT_CIPHER_IDEA, "IDEA" },
+ { PCT_CIPHER_RC2, "RC2" },
+ { PCT_CIPHER_RC4, "RC4" },
+ { PCT_CIPHER_DES_112, "DES 112 bit" },
+ { PCT_CIPHER_DES_168, "DES 168 bit" },
+ { 0x00, NULL }
};
const value_string pct_hash_type[] = {
- { PCT_HASH_MD5, "MD5" },
- { PCT_HASH_MD5_TRUNC_64, "MD5_TRUNC_64"},
- { PCT_HASH_SHA, "SHA"},
- { PCT_HASH_SHA_TRUNC_80, "SHA_TRUNC_80"},
- { PCT_HASH_DES_DM, "DES_DM"},
- { 0x00, NULL }
+ { PCT_HASH_MD5, "MD5" },
+ { PCT_HASH_MD5_TRUNC_64, "MD5_TRUNC_64"},
+ { PCT_HASH_SHA, "SHA"},
+ { PCT_HASH_SHA_TRUNC_80, "SHA_TRUNC_80"},
+ { PCT_HASH_DES_DM, "DES_DM"},
+ { 0x00, NULL }
};
const value_string pct_cert_type[] = {
- { PCT_CERT_NONE, "None" },
- { PCT_CERT_X509, "X.509" },
- { PCT_CERT_PKCS7, "PKCS #7" },
- { 0x00, NULL }
+ { PCT_CERT_NONE, "None" },
+ { PCT_CERT_X509, "X.509" },
+ { PCT_CERT_PKCS7, "PKCS #7" },
+ { 0x00, NULL }
};
const value_string pct_sig_type[] = {
- { PCT_SIG_NONE, "None" },
- { PCT_SIG_RSA_MD5, "MD5" },
- { PCT_SIG_RSA_SHA, "RSA SHA" },
- { PCT_SIG_DSA_SHA, "DSA SHA" },
- { 0x00, NULL }
+ { PCT_SIG_NONE, "None" },
+ { PCT_SIG_RSA_MD5, "MD5" },
+ { PCT_SIG_RSA_SHA, "RSA SHA" },
+ { PCT_SIG_DSA_SHA, "DSA SHA" },
+ { 0x00, NULL }
};
const value_string pct_exch_type[] = {
- { PCT_EXCH_RSA_PKCS1, "RSA PKCS#1" },
- { PCT_EXCH_RSA_PKCS1_TOKEN_DES, "RSA PKCS#1 Token DES" },
- { PCT_EXCH_RSA_PKCS1_TOKEN_DES3, "RSA PKCS#1 Token 3DES" },
- { PCT_EXCH_RSA_PKCS1_TOKEN_RC2, "RSA PKCS#1 Token RC-2" },
- { PCT_EXCH_RSA_PKCS1_TOKEN_RC4, "RSA PKCS#1 Token RC-4" },
- { PCT_EXCH_DH_PKCS3, "DH PKCS#3" },
- { PCT_EXCH_DH_PKCS3_TOKEN_DES, "DH PKCS#3 Token DES" },
- { PCT_EXCH_DH_PKCS3_TOKEN_DES3, "DH PKCS#3 Token 3DES" },
- { PCT_EXCH_FORTEZZA_TOKEN, "Fortezza" },
- { 0x00, NULL }
+ { PCT_EXCH_RSA_PKCS1, "RSA PKCS#1" },
+ { PCT_EXCH_RSA_PKCS1_TOKEN_DES, "RSA PKCS#1 Token DES" },
+ { PCT_EXCH_RSA_PKCS1_TOKEN_DES3, "RSA PKCS#1 Token 3DES" },
+ { PCT_EXCH_RSA_PKCS1_TOKEN_RC2, "RSA PKCS#1 Token RC-2" },
+ { PCT_EXCH_RSA_PKCS1_TOKEN_RC4, "RSA PKCS#1 Token RC-4" },
+ { PCT_EXCH_DH_PKCS3, "DH PKCS#3" },
+ { PCT_EXCH_DH_PKCS3_TOKEN_DES, "DH PKCS#3 Token DES" },
+ { PCT_EXCH_DH_PKCS3_TOKEN_DES3, "DH PKCS#3 Token 3DES" },
+ { PCT_EXCH_FORTEZZA_TOKEN, "Fortezza" },
+ { 0x00, NULL }
};
const value_string pct_error_code[] = {
- { PCT_ERR_BAD_CERTIFICATE, "PCT_ERR_BAD_CERTIFICATE" },
- { PCT_ERR_CLIENT_AUTH_FAILED, "PCT_ERR_CLIENT_AUTH_FAILE" },
- { PCT_ERR_ILLEGAL_MESSAGE, "PCT_ERR_ILLEGAL_MESSAGE" },
- { PCT_ERR_INTEGRITY_CHECK_FAILED, "PCT_ERR_INTEGRITY_CHECK_FAILED" },
- { PCT_ERR_SERVER_AUTH_FAILED, "PCT_ERR_SERVER_AUTH_FAILED" },
- { PCT_ERR_SPECS_MISMATCH, "PCT_ERR_SPECS_MISMATCH" },
- { 0x00, NULL }
+ { PCT_ERR_BAD_CERTIFICATE, "PCT_ERR_BAD_CERTIFICATE" },
+ { PCT_ERR_CLIENT_AUTH_FAILED, "PCT_ERR_CLIENT_AUTH_FAILE" },
+ { PCT_ERR_ILLEGAL_MESSAGE, "PCT_ERR_ILLEGAL_MESSAGE" },
+ { PCT_ERR_INTEGRITY_CHECK_FAILED, "PCT_ERR_INTEGRITY_CHECK_FAILED" },
+ { PCT_ERR_SERVER_AUTH_FAILED, "PCT_ERR_SERVER_AUTH_FAILED" },
+ { PCT_ERR_SPECS_MISMATCH, "PCT_ERR_SPECS_MISMATCH" },
+ { 0x00, NULL }
};
/* RFC 4366 */
const value_string tls_hello_extension_types[] = {
- { 0, "server_name" },
- { 1, "max_fragment_length" },
- { 2, "client_certificate_url" },
- { 3, "trusted_ca_keys" },
- { 4, "truncated_hmac" },
- { 5, "status_request" },
- { 6, "user_mapping" },
- { 7, "Reserved" },
- { 8, "Reserved" },
- { 9, "cert_type" },
- { 10, "elliptic_curves" },
- { 11, "ec_point_formats" },
- { 35, "SessionTicket TLS" },
- { 0, NULL }
+ { 0, "server_name" },
+ { 1, "max_fragment_length" },
+ { 2, "client_certificate_url" },
+ { 3, "trusted_ca_keys" },
+ { 4, "truncated_hmac" },
+ { 5, "status_request" },
+ { 6, "user_mapping" }, /* RFC 4681 */
+ { 7, "client_authz" },
+ { 8, "server_authz" },
+ { 9, "cert_type" }, /* RFC 5081 */
+ { SSL_HND_HELLO_EXT_ELLIPTIC_CURVES, "elliptic_curves" }, /* RFC 4492 */
+ { SSL_HND_HELLO_EXT_EC_POINT_FORMATS, "ec_point_formats" }, /* RFC 4492 */
+ { 12, "srp" }, /* RFC 5054 */
+ { 13, "signature_algorithms" }, /* RFC 5246 */
+ { 14, "use_srtp" },
+ { 35, "SessionTicket TLS" }, /* RFC 4507 */
+ { 65281, "renegotiation_info" },
+ { 0, NULL }
+};
+
+/* RFC 5246 7.4.1.4.1 */
+const value_string tls_hash_algorithm[] = {
+ { 0, "None" },
+ { 1, "MD5" },
+ { 2, "SHA1" },
+ { 3, "SHA224" },
+ { 4, "SHA256" },
+ { 5, "SHA384" },
+ { 6, "SHA512" },
+ { 0, NULL }
+};
+
+const value_string tls_signature_algorithm[] = {
+ { 0, "Anonymous" },
+ { 1, "RSA" },
+ { 2, "DSA" },
+ { 3, "ECDSA" },
+ { 0, NULL }
};
+/* RFC 6091 3.1 */
+const value_string tls_certificate_type[] = {
+ { 0, "X.509" },
+ { 1, "OpenPGP" },
+ { 0, NULL }
+};
+
+const value_string tls_cert_status_type[] = {
+ { SSL_HND_CERT_STATUS_TYPE_OCSP, "OCSP" },
+ { 0, NULL }
+};
/* we keep this internal to packet-ssl-utils, as there should be
no need to access it any other way.
};
static gint
-ssl_data_alloc(StringInfo* str, guint len)
+ssl_data_alloc(StringInfo* str, size_t len)
{
str->data = g_malloc(len);
/* the allocator can return a null pointer for a size equal to 0,
* and that must be allowed */
if (len > 0 && !str->data)
return -1;
- str->data_len = len;
+ str->data_len = (guint) len;
return 0;
}
str->data_len = len;
}
-#ifdef HAVE_LIBGNUTLS
+#if defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT)
static gint ver_major, ver_minor, ver_patch;
/* hmac abstraction layer */
#define SSL_HMAC gcry_md_hd_t
-static inline void
+static inline gint
ssl_hmac_init(SSL_HMAC* md, const void * key, gint len, gint algo)
{
- gcry_md_open(md,algo, GCRY_MD_FLAG_HMAC);
+ gcry_error_t err;
+ const char *err_str, *err_src;
+ err = gcry_md_open(md,algo, GCRY_MD_FLAG_HMAC);
+ if (err != 0) {
+ err_str = gcry_strerror(err);
+ err_src = gcry_strsource(err);
+ ssl_debug_printf("ssl_hmac_init(): gcry_md_open failed %s/%s", err_str, err_src);
+ return -1;
+ }
gcry_md_setkey (*(md), key, len);
+ return 0;
}
static inline void
ssl_hmac_update(SSL_HMAC* md, const void* data, gint len)
/* memory digest abstraction layer*/
#define SSL_MD gcry_md_hd_t
-static inline void
+static inline gint
ssl_md_init(SSL_MD* md, gint algo)
{
- gcry_md_open(md,algo, 0);
+ gcry_error_t err;
+ const char *err_str, *err_src;
+ err = gcry_md_open(md,algo, 0);
+ if (err != 0) {
+ err_str = gcry_strerror(err);
+ err_src = gcry_strsource(err);
+ ssl_debug_printf("ssl_md_init(): gcry_md_open failed %s/%s", err_str, err_src);
+ return -1;
+ }
+ return 0;
}
static inline void
ssl_md_update(SSL_MD* md, guchar* data, gint len)
gint
ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len)
{
- /* guchar * ivp; */
- gint ret;
- /* gint i; */
- gcry_cipher_hd_t c;
- ret=0;
- c=(gcry_cipher_hd_t)*cipher;
+ /* guchar * ivp; */
+ gint ret;
+ /* gint i; */
+ /* gcry_cipher_hd_t c; */
+ ret=0;
+ /*c=(gcry_cipher_hd_t)*cipher;*/
- ssl_debug_printf("--------------------------------------------------------------------");
- /*for(ivp=c->iv,i=0; i < iv_len; i++ )
- {
- ssl_debug_printf("%d ",ivp[i]);
- i++;
- }
- */
- ssl_debug_printf("--------------------------------------------------------------------");
- ret = gcry_cipher_setiv(*(cipher), iv, iv_len);
- /*for(ivp=c->iv,i=0; i < iv_len; i++ )
- {
- ssl_debug_printf("%d ",ivp[i]);
- i++;
- }
- */
- ssl_debug_printf("--------------------------------------------------------------------");
- return ret;
+ ssl_debug_printf("--------------------------------------------------------------------");
+ /*for(ivp=c->iv,i=0; i < iv_len; i++ )
+ {
+ ssl_debug_printf("%d ",ivp[i]);
+ i++;
+ }
+ */
+ ssl_debug_printf("--------------------------------------------------------------------");
+ ret = gcry_cipher_setiv(*(cipher), iv, iv_len);
+ /*for(ivp=c->iv,i=0; i < iv_len; i++ )
+ {
+ ssl_debug_printf("%d ",ivp[i]);
+ i++;
+ }
+ */
+ ssl_debug_printf("--------------------------------------------------------------------");
+ return ret;
}
/* stream cipher abstraction layer*/
static gint
{
gint gcry_modes[]={GCRY_CIPHER_MODE_STREAM,GCRY_CIPHER_MODE_CBC};
gint err;
+ if (algo == -1) {
+ /* NULL mode */
+ *(cipher) = (gcry_cipher_hd_t)-1;
+ return 0;
+ }
err = gcry_cipher_open(cipher, algo, gcry_modes[mode], 0);
if (err !=0)
return -1;
ssl_cipher_decrypt(gcry_cipher_hd_t *cipher, guchar * out, gint outl,
const guchar * in, gint inl)
{
+ if ((*cipher) == (gcry_cipher_hd_t)-1)
+ {
+ if (in && inl)
+ memcpy(out, in, outl < inl ? outl : inl);
+ return 0;
+ }
return gcry_cipher_decrypt ( *(cipher), out, outl, in, inl);
}
static inline gint
static inline void
ssl_cipher_cleanup(gcry_cipher_hd_t *cipher)
{
- gcry_cipher_close(*cipher);
+ if ((*cipher) != (gcry_cipher_hd_t)-1)
+ gcry_cipher_close(*cipher);
*cipher = NULL;
}
#define PUBKEY_FLAG_NO_BLINDING (1 << 0)
+const gchar*
+ssl_private_key_to_str(SSL_PRIVATE_KEY* pk)
+{
+ const gchar *str="NULL";
+ size_t n;
+ gchar *buf;
+
+ if (!pk) return str;
+#ifndef SSL_FAST
+ n = gcry_sexp_sprint(pk, GCRYSEXP_FMT_ADVANCED, NULL, 0);
+ buf = ep_alloc(n);
+ n = gcry_sexp_sprint(pk, GCRYSEXP_FMT_ADVANCED, buf, n);
+ str = buf;
+#else /* SSL_FAST */
+ str = "TO DO: dump mpi gcry_mpi_print()";
+#endif /* SSL_FAST */
+
+ return str;
+}
+
/* decrypt data with private key. Store decrypted data directly into input
* buffer */
int
decr_len = 0;
encr_len = len;
text=NULL;
+
/* build up a mpi rappresentation for encrypted data */
rc = gcry_mpi_scan(&encr_mpi, GCRYMPI_FMT_USG,encr_data, encr_len, &encr_len);
if (rc != 0 ) {
return 0;
}
+ /*ssl_debug_printf("pcry_private_decrypt: pk=%s\n", ssl_private_key_to_str(pk));*/
+
#ifndef SSL_FAST
/* put the data into a simple list */
rc = gcry_sexp_build(&s_data, NULL, "(enc-val(rsa(a%m)))", encr_mpi);
/* sanity check on out buffer */
if (decr_len > len) {
- ssl_debug_printf("pcry_private_decrypt: decrypted data is too long ?!? (%zd max %d)\n",
+ ssl_debug_printf("pcry_private_decrypt: decrypted data is too long ?!? (%" G_GSIZE_MODIFIER "u max %d)\n",
decr_len, len);
return 0;
}
decr_data_ptr = encr_data;
if (gcry_mpi_print( GCRYMPI_FMT_USG, decr_data_ptr, decr_len, &decr_len,
text) != 0) {
- ssl_debug_printf("pcry_private_decrypt: can't print decr data to mpi (size %zd):%s\n",
+ ssl_debug_printf("pcry_private_decrypt: can't print decr data to mpi (size %" G_GSIZE_MODIFIER "u):%s\n",
decr_len, gcry_strerror(rc));
g_free(decr_data_ptr);
decr_len = 0;
rc = 0;
for (i = 1; i < decr_len; i++) {
if (decr_data_ptr[i] == 0) {
- rc = i+1;
+ rc = (gint) i+1;
break;
}
}
- ssl_debug_printf("pcry_private_decrypt: stripping %d bytes, decr_len %zd\n",
+ ssl_debug_printf("pcry_private_decrypt: stripping %d bytes, decr_len %" G_GSIZE_MODIFIER "u\n",
rc, decr_len);
ssl_print_data("decrypted_unstrip_pre_master", decr_data_ptr, decr_len);
g_memmove(decr_data_ptr, &decr_data_ptr[rc], decr_len - rc);
decr_len -= rc;
#endif /* SSL_FAST */
gcry_mpi_release(text);
- return decr_len;
+ return (int) decr_len;
}
/* stringinfo interface */
tls_prf(secret,usage,rnd1,rnd2,out))
static const gchar *digests[]={
- "MD5",
- "SHA1"
+ "MD5",
+ "SHA1"
};
static const gchar *ciphers[]={
- "DES",
- "3DES",
- "ARCFOUR", /* gnutls does not support rc4, but this should be 100% compatible*/
- "RC2",
- "IDEA",
- "AES",
- "AES256",
- "*UNKNOWN*"
+ "DES",
+ "3DES",
+ "ARCFOUR", /* gnutls does not support rc4, but this should be 100% compatible*/
+ "RC2",
+ "IDEA",
+ "AES",
+ "AES256",
+ "*UNKNOWN*"
};
static SslCipherSuite cipher_suites[]={
- {1,KEX_RSA,SIG_RSA,ENC_NULL,0,0,0,DIG_MD5,16,0, SSL_CIPHER_MODE_STREAM},
- {2,KEX_RSA,SIG_RSA,ENC_NULL,0,0,0,DIG_SHA,20,0, SSL_CIPHER_MODE_STREAM},
+ {1,KEX_RSA,SIG_RSA,ENC_NULL,1,0,0,DIG_MD5,16,0, SSL_CIPHER_MODE_STREAM},
+ {2,KEX_RSA,SIG_RSA,ENC_NULL,1,0,0,DIG_SHA,20,0, SSL_CIPHER_MODE_STREAM},
{3,KEX_RSA,SIG_RSA,ENC_RC4,1,128,40,DIG_MD5,16,1, SSL_CIPHER_MODE_STREAM},
{4,KEX_RSA,SIG_RSA,ENC_RC4,1,128,128,DIG_MD5,16,0, SSL_CIPHER_MODE_STREAM},
{5,KEX_RSA,SIG_RSA,ENC_RC4,1,128,128,DIG_SHA,20,0, SSL_CIPHER_MODE_STREAM},
{100,KEX_RSA,SIG_RSA,ENC_RC4,1,128,56,DIG_SHA,20,1, SSL_CIPHER_MODE_STREAM},
{101,KEX_DH,SIG_DSS,ENC_RC4,1,128,56,DIG_SHA,20,1, SSL_CIPHER_MODE_STREAM},
{102,KEX_DH,SIG_DSS,ENC_RC4,1,128,128,DIG_SHA,20,0, SSL_CIPHER_MODE_STREAM},
+ /*{138,KEX_PSK,SIG_RSA,ENC_RC4,16,128,128,DIG_SHA,20,0, SSL_CIPHER_MODE_CBC},*/
+ {139,KEX_PSK,SIG_RSA,ENC_3DES,8,192,192,DIG_SHA,20,0, SSL_CIPHER_MODE_CBC},
+ {140,KEX_PSK,SIG_RSA,ENC_AES,16,128,128,DIG_SHA,20,0, SSL_CIPHER_MODE_CBC},
+ {141,KEX_PSK,SIG_RSA,ENC_AES256,16,256,256,DIG_SHA,20,0, SSL_CIPHER_MODE_CBC},
{-1, 0,0,0,0,0,0,0,0,0, 0}
};
guint8 *ptr;
StringInfo s1, s2;
guint i,s_l, r;
- gint usage_len;
+ size_t usage_len;
r=-1;
usage_len = strlen(usage);
}
if (ssl_data_alloc(&seed, usage_len+rnd1->data_len+rnd2->data_len) < 0) {
ssl_debug_printf("tls_prf: can't allocate rnd %d\n",
- usage_len+rnd1->data_len+rnd2->data_len);
+ (int) (usage_len+rnd1->data_len+rnd2->data_len));
goto free_md5;
}
}
#ifdef HAVE_LIBZ
-/* memory allocations functions for zlib intialization */
+/* memory allocation functions for zlib initialization */
static void* ssl_zalloc(void* opaque _U_, unsigned int no, unsigned int size)
{
- return g_malloc0(no*size);
+ return g_malloc0(no*size);
}
-static void ssl_zfree(void* opaque _U_, void* address)
+static void ssl_zfree(void* opaque _U_, void* addr)
{
- g_free(address);
+ g_free(addr);
}
#endif
static SslDecompress*
ssl_create_decompressor(gint compression)
{
- SslDecompress *decomp;
+ SslDecompress *decomp;
#ifdef HAVE_LIBZ
- int err;
+ int err;
#endif
- if (compression == 0) return NULL;
- ssl_debug_printf("ssl_create_decompressor: compression method %d\n", compression);
- decomp = se_alloc(sizeof(SslDecompress));
- decomp->compression = compression;
- switch (decomp->compression) {
+ if (compression == 0) return NULL;
+ ssl_debug_printf("ssl_create_decompressor: compression method %d\n", compression);
+ decomp = se_alloc(sizeof(SslDecompress));
+ decomp->compression = compression;
+ switch (decomp->compression) {
#ifdef HAVE_LIBZ
- case 1: /* DEFLATE */
- decomp->istream.zalloc = ssl_zalloc;
- decomp->istream.zfree = ssl_zfree;
- decomp->istream.opaque = Z_NULL;
- decomp->istream.next_in = Z_NULL;
- decomp->istream.next_out = Z_NULL;
- decomp->istream.avail_in = 0;
- decomp->istream.avail_out = 0;
- err = inflateInit_(&decomp->istream, ZLIB_VERSION, sizeof(z_stream));
- if (err != Z_OK) {
- ssl_debug_printf("ssl_create_decompressor: inflateInit_() failed - %d\n", err);
- return NULL;
- }
- break;
+ case 1: /* DEFLATE */
+ decomp->istream.zalloc = ssl_zalloc;
+ decomp->istream.zfree = ssl_zfree;
+ decomp->istream.opaque = Z_NULL;
+ decomp->istream.next_in = Z_NULL;
+ decomp->istream.next_out = Z_NULL;
+ decomp->istream.avail_in = 0;
+ decomp->istream.avail_out = 0;
+ err = inflateInit_(&decomp->istream, ZLIB_VERSION, sizeof(z_stream));
+ if (err != Z_OK) {
+ ssl_debug_printf("ssl_create_decompressor: inflateInit_() failed - %d\n", err);
+ return NULL;
+ }
+ break;
#endif
- default:
- ssl_debug_printf("ssl_create_decompressor: unsupported compression method %d\n", decomp->compression);
- return NULL;
- }
- return decomp;
+ default:
+ ssl_debug_printf("ssl_create_decompressor: unsupported compression method %d\n", decomp->compression);
+ return NULL;
+ }
+ return decomp;
}
static SslDecoder*
if(cipher_suite->enc!=ENC_NULL) {
ssl_debug_printf("ssl_create_decoder CIPHER: %s\n", ciphers[cipher_suite->enc-0x30]);
ciph=ssl_get_cipher_by_name(ciphers[cipher_suite->enc-0x30]);
+ } else {
+ ssl_debug_printf("ssl_create_decoder CIPHER: %s\n", "NULL");
+ ciph = -1;
}
if (ciph == 0) {
ssl_debug_printf("ssl_create_decoder can't find cipher %s\n",
/* if master_key is not yet generate, create it now*/
if (!(ssl_session->state & SSL_MASTER_SECRET)) {
ssl_debug_printf("ssl_generate_keyring_material:PRF(pre_master_secret)\n");
+ ssl_print_string("pre master secret",&ssl_session->pre_master_secret);
+ ssl_print_string("client random",&ssl_session->client_random);
+ ssl_print_string("server random",&ssl_session->server_random);
if (PRF(ssl_session,&ssl_session->pre_master_secret,"master secret",
&ssl_session->client_random,
&ssl_session->server_random, &ssl_session->master_secret)) {
key_block.data_len = needed;
key_block.data = g_malloc(needed);
- if (!key_block.data) {
- ssl_debug_printf("ssl_generate_keyring_material can't allocate key_block (len %d)\n", needed);
- return -1;
- }
ssl_debug_printf("ssl_generate_keyring_material sess key generation\n");
if (PRF(ssl_session,&ssl_session->master_secret,"key expansion",
&ssl_session->server_random,&ssl_session->client_random,
void
ssl_change_cipher(SslDecryptSession *ssl_session, gboolean server)
{
- ssl_debug_printf("ssl_change_cipher %s\n", (server)?"SERVER":"CLIENT");
- if (server) {
- ssl_session->server = ssl_session->server_new;
- ssl_session->server_new = NULL;
- } else {
- ssl_session->client = ssl_session->client_new;
- ssl_session->client_new = NULL;
- }
+ ssl_debug_printf("ssl_change_cipher %s\n", (server)?"SERVER":"CLIENT");
+ if (server) {
+ ssl_session->server = ssl_session->server_new;
+ ssl_session->server_new = NULL;
+ } else {
+ ssl_session->client = ssl_session->client_new;
+ ssl_session->client_new = NULL;
+ }
}
int
ssl_decrypt_pre_master_secret(SslDecryptSession*ssl_session,
- StringInfo* entrypted_pre_master, SSL_PRIVATE_KEY *pk)
+ StringInfo* encrypted_pre_master, SSL_PRIVATE_KEY *pk)
{
gint i;
- if(ssl_session->cipher_suite.kex!=KEX_RSA) {
- ssl_debug_printf("ssl_decrypt_pre_master_secret key %d different from KEX_RSA(%d)\n",
+ if(ssl_session->cipher_suite.kex == KEX_DH) {
+ ssl_debug_printf("ssl_decrypt_pre_master_secret session uses DH (%d) key exchange, which is impossible to decrypt\n",
+ KEX_DH);
+ return -1;
+ } else if(ssl_session->cipher_suite.kex != KEX_RSA) {
+ ssl_debug_printf("ssl_decrypt_pre_master_secret key exchange %d different from KEX_RSA (%d)\n",
ssl_session->cipher_suite.kex, KEX_RSA);
- return(-1);
+ return -1;
}
/* with tls key loading will fail if not rsa type, so no need to check*/
- ssl_print_string("pre master encrypted",entrypted_pre_master);
+ ssl_print_string("pre master encrypted",encrypted_pre_master);
ssl_debug_printf("ssl_decrypt_pre_master_secret:RSA_private_decrypt\n");
- i=ssl_private_decrypt(entrypted_pre_master->data_len,
- entrypted_pre_master->data, pk);
+ i=ssl_private_decrypt(encrypted_pre_master->data_len,
+ encrypted_pre_master->data, pk);
if (i!=48) {
ssl_debug_printf("ssl_decrypt_pre_master_secret wrong "
}
/* the decrypted data has been written into the pre_master key buffer */
- ssl_session->pre_master_secret.data = entrypted_pre_master->data;
+ ssl_session->pre_master_secret.data = encrypted_pre_master->data;
ssl_session->pre_master_secret.data_len=48;
ssl_print_string("pre master secret",&ssl_session->pre_master_secret);
gint md;
guint32 len;
guint8 buf[20];
+ gint16 temp;
md=ssl_get_digest_by_name(digests[decoder->cipher_suite->dig-0x40]);
ssl_debug_printf("tls_check_mac mac type:%s md %d\n",
digests[decoder->cipher_suite->dig-0x40], md);
- ssl_hmac_init(&hm,decoder->mac_key.data,decoder->mac_key.data_len,md);
+ if (ssl_hmac_init(&hm,decoder->mac_key.data,decoder->mac_key.data_len,md) != 0)
+ return -1;;
/* hash sequence number */
fmt_seq(decoder->seq,buf);
ssl_hmac_update(&hm,buf,1);
/* hash version,data length and data*/
- *((gint16*)buf) = g_htons(ver);
+ /* *((gint16*)buf) = g_htons(ver); */
+ temp = g_htons(ver);
+ memcpy(buf, &temp, 2);
ssl_hmac_update(&hm,buf,2);
- *((gint16*)buf) = g_htons(datalen);
+ /* *((gint16*)buf) = g_htons(datalen); */
+ temp = g_htons(datalen);
+ memcpy(buf, &temp, 2);
ssl_hmac_update(&hm,buf,2);
ssl_hmac_update(&hm,data,datalen);
/* get digest and digest len*/
ssl_hmac_final(&hm,buf,&len);
+ ssl_hmac_cleanup(&hm);
ssl_print_data("Mac", buf, len);
if(memcmp(mac,buf,len))
return -1;
- ssl_hmac_cleanup(&hm);
- return(0);
+ return 0;
}
int
guint32 len;
guint8 buf[64],dgst[20];
gint pad_ct;
+ gint16 temp;
pad_ct=(decoder->cipher_suite->dig==DIG_SHA)?40:48;
/* get cipher used for digest comptuation */
md=ssl_get_digest_by_name(digests[decoder->cipher_suite->dig-0x40]);
- ssl_md_init(&mc,md);
+ if (ssl_md_init(&mc,md) !=0)
+ return -1;
/* do hash computation on data && padding */
ssl_md_update(&mc,decoder->mac_key.data,decoder->mac_key.data_len);
ssl_md_update(&mc,buf,1);
/* hash data length in network byte order and data*/
- *((gint16* )buf) = g_htons(datalen);
+ /* *((gint16* )buf) = g_htons(datalen); */
+ temp = g_htons(datalen);
+ memcpy(buf, &temp, 2);
ssl_md_update(&mc,buf,2);
ssl_md_update(&mc,data,datalen);
ssl_debug_printf("dtls_check_mac mac type:%s md %d\n",
digests[decoder->cipher_suite->dig-0x40], md);
- ssl_hmac_init(&hm,decoder->mac_key.data,decoder->mac_key.data_len,md);
+ if (ssl_hmac_init(&hm,decoder->mac_key.data,decoder->mac_key.data_len,md) != 0)
+ return -1;
ssl_debug_printf("dtls_check_mac seq: %d epoch: %d\n",decoder->seq,decoder->epoch);
/* hash sequence number */
fmt_seq(decoder->seq,buf);
ssl_hmac_update(&hm,data,datalen);
/* get digest and digest len */
ssl_hmac_final(&hm,buf,&len);
+ ssl_hmac_cleanup(&hm);
ssl_print_data("Mac", buf, len);
if(memcmp(mac,buf,len))
return -1;
- ssl_hmac_cleanup(&hm);
return(0);
}
#endif
int
ssl_decompress_record(SslDecompress* decomp, const guchar* in, guint inl, StringInfo* out_str, guint* outl)
{
- gint err;
+ gint err;
- switch (decomp->compression) {
- case 1: /* DEFLATE */
- err = Z_OK;
- if (out_str->data_len < 16384) { /* maximal plain length */
- ssl_data_realloc(out_str, 16384);
- }
- decomp->istream.next_in = (guchar*)in;
- decomp->istream.avail_in = inl;
- decomp->istream.next_out = out_str->data;
- decomp->istream.avail_out = out_str->data_len;
- if (inl > 0)
- err = inflate(&decomp->istream, Z_SYNC_FLUSH);
- if (err != Z_OK) {
- ssl_debug_printf("ssl_decompress_record: inflate() failed - %d\n", err);
- return -1;
- }
- *outl = out_str->data_len - decomp->istream.avail_out;
- break;
- default:
- ssl_debug_printf("ssl_decompress_record: unsupported compression method %d\n", decomp->compression);
- return -1;
- }
- return 0;
+ switch (decomp->compression) {
+ case 1: /* DEFLATE */
+ err = Z_OK;
+ if (out_str->data_len < 16384) { /* maximal plain length */
+ ssl_data_realloc(out_str, 16384);
+ }
+ decomp->istream.next_in = (guchar*)in;
+ decomp->istream.avail_in = inl;
+ decomp->istream.next_out = out_str->data;
+ decomp->istream.avail_out = out_str->data_len;
+ if (inl > 0)
+ err = inflate(&decomp->istream, Z_SYNC_FLUSH);
+ if (err != Z_OK) {
+ ssl_debug_printf("ssl_decompress_record: inflate() failed - %d\n", err);
+ return -1;
+ }
+ *outl = out_str->data_len - decomp->istream.avail_out;
+ break;
+ default:
+ ssl_debug_printf("ssl_decompress_record: unsupported compression method %d\n", decomp->compression);
+ return -1;
+ }
+ return 0;
}
#else
int
ssl_decompress_record(SslDecompress* decomp _U_, const guchar* in _U_, guint inl _U_, StringInfo* out_str _U_, guint* outl _U_)
{
- ssl_debug_printf("ssl_decompress_record: unsupported compression method %d\n", decomp->compression);
- return -1;
+ ssl_debug_printf("ssl_decompress_record: unsupported compression method %d\n", decomp->compression);
+ return -1;
}
#endif
size_t tmp_size;
gcry_sexp_t rsa_priv_key;
gint major, minor, patch;
- gint i;
+ gint i, p_idx, q_idx;
+ int ret;
+ size_t buf_len;
+ unsigned char buf_keyid[32];
#ifdef SSL_FAST
gcry_mpi_t* rsa_params = g_malloc(sizeof(gcry_mpi_t)*RSA_PARS);
gcry_mpi_t rsa_params[RSA_PARS];
#endif
+ buf_len = sizeof(buf_keyid);
+ ret = gnutls_x509_privkey_get_key_id(priv_key, 0, buf_keyid, &buf_len);
+ if (ret != 0) {
+ ssl_debug_printf( "gnutls_x509_privkey_get_key_id(ssl_pkey, 0, buf_keyid, &buf_len) - %s\n", gnutls_strerror(ret));
+ } else {
+ ssl_debug_printf( "Private key imported: KeyID %s\n", bytes_to_str_punct(buf_keyid, (int) buf_len, ':'));
+ }
+
/*
* note: openssl and gnutls use 'p' and 'q' with opposite meaning:
* our 'p' must be equal to 'q' as provided from openssl and viceversa
*/
+#if (LIBGNUTLS_VERSION_MAJOR>2)||((LIBGNUTLS_VERSION_MAJOR==2)&&(LIBGNUTLS_VERSION_MINOR>=5))
+ p_idx = 3; q_idx = 4;
+#else /* versions 2.4.x and older need 'p' and 'q' swapped */
+ p_idx = 4; q_idx = 3;
+#endif
+
/* RSA get parameter */
if (gnutls_x509_privkey_export_rsa_raw(priv_key,
- &rsa_datum[0], &rsa_datum[1], &rsa_datum[2], &rsa_datum[4], &rsa_datum[3], &rsa_datum[5]) != 0) {
+ &rsa_datum[0],
+ &rsa_datum[1],
+ &rsa_datum[2],
+ &rsa_datum[p_idx],
+ &rsa_datum[q_idx],
+ &rsa_datum[5]) != 0) {
ssl_debug_printf("ssl_load_key: can't export rsa param (is a rsa private key file ?!?)\n");
#ifdef SSL_FAST
g_free(rsa_params);
#if SSL_FAST
return rsa_params;
#else
- {
- gint i;
- for (i=0; i< 6; i++)
- gcry_mpi_release(rsa_params[i]);
- }
+ for (i=0; i< 6; i++)
+ gcry_mpi_release(rsa_params[i]);
return rsa_priv_key;
#endif
}
key.data = g_malloc(size);
key.size = size;
- bytes = fread(key.data, 1, key.size, fp);
+ bytes = (guint) fread(key.data, 1, key.size, fp);
if (bytes < key.size) {
ssl_debug_printf("ssl_load_key: can't read from file %d bytes, got %d\n",
key.size, bytes);
g_free(key.data);
return NULL;
}
+
+ if (gnutls_x509_privkey_get_pk_algorithm(priv_key) != GNUTLS_PK_RSA) {
+ ssl_debug_printf("ssl_load_key: private key public key algorithm isn't RSA\n");
+ g_free(private_key);
+ g_free(key.data);
+ return NULL;
+ }
+
g_free(key.data);
private_key->x509_pkey = priv_key;
return private_key;
}
-const char *BAGTYPE(gnutls_pkcs12_bag_type_t x) {
- switch (x) {
- case GNUTLS_BAG_EMPTY: return "Empty";
- case GNUTLS_BAG_PKCS8_ENCRYPTED_KEY: return "PKCS#8 Encrypted key";
- case GNUTLS_BAG_PKCS8_KEY: return "PKCS#8 Key";
- case GNUTLS_BAG_CERTIFICATE: return "Certificate";
- case GNUTLS_BAG_CRL: return "CRL";
- case GNUTLS_BAG_ENCRYPTED: return "Encrypted";
- case GNUTLS_BAG_UNKNOWN: return "Unknown";
- default: return "<undefined>";
+static const char *
+BAGTYPE(gnutls_pkcs12_bag_type_t x) {
+ switch (x) {
+ case GNUTLS_BAG_EMPTY: return "Empty";
+ case GNUTLS_BAG_PKCS8_ENCRYPTED_KEY: return "PKCS#8 Encrypted key";
+ case GNUTLS_BAG_PKCS8_KEY: return "PKCS#8 Key";
+ case GNUTLS_BAG_CERTIFICATE: return "Certificate";
+ case GNUTLS_BAG_CRL: return "CRL";
+ case GNUTLS_BAG_ENCRYPTED: return "Encrypted";
+ case GNUTLS_BAG_UNKNOWN: return "Unknown";
+ default: return "<undefined>";
}
}
Ssl_private_key_t *
ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd) {
- int i, j, ret, len;
- size_t rest;
- unsigned char *p;
- gnutls_datum_t data;
- gnutls_pkcs12_bag_t bag = NULL;
- gnutls_pkcs12_bag_type_t bag_type;
- size_t buf_len;
- static char buf_name[256];
- static char buf_email[128];
- unsigned char buf_keyid[32];
-
- gnutls_pkcs12_t ssl_p12 = NULL;
- gnutls_x509_crt_t ssl_cert = NULL;
- gnutls_x509_privkey_t ssl_pkey = NULL;
-
- Ssl_private_key_t *private_key = g_malloc(sizeof(Ssl_private_key_t));
- private_key->x509_cert = 0;
- private_key->x509_pkey = 0;
- private_key->sexp_pkey = 0;
-
- rest = 4096;
- data.data = g_malloc(rest);
- data.size = rest;
- p = data.data;
- while ((len = fread(p, 1, rest, fp)) > 0) {
- p += len;
- rest -= len;
- if (!rest) {
- rest = 1024;
- data.data = g_realloc(data.data, data.size + rest);
- p = data.data + data.size;
- data.size += rest;
- }
- }
- data.size -= rest;
- ssl_debug_printf("%d bytes read\n", data.size);
- if (!feof(fp)) {
- ssl_debug_printf( "Error during certificate reading.\n");
- g_free(private_key);
- return 0;
- }
-
- ret = gnutls_pkcs12_init(&ssl_p12);
- if (ret < 0) {
- ssl_debug_printf("gnutls_pkcs12_init(&st_p12) - %s", gnutls_strerror(ret));
- g_free(private_key);
- return 0;
- }
- ret = gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_DER, 0);
- g_free(data.data);
- if (ret < 0) {
- ssl_debug_printf("gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_DER, 0) - %s\n", gnutls_strerror(ret));
- g_free(private_key);
- return 0;
- }
-
- ssl_debug_printf( "PKCS#12 imported\n");
-
- for (i=0; ret==0; i++) {
-
- if (bag) { gnutls_pkcs12_bag_deinit(bag); bag = NULL; }
-
- ret = gnutls_pkcs12_bag_init(&bag);
- if (ret < 0) continue;
-
- ret = gnutls_pkcs12_get_bag(ssl_p12, i, bag);
- if (ret < 0) continue;
+ int i, j, ret;
+ int rest;
+ unsigned char *p;
+ gnutls_datum_t data;
+ gnutls_pkcs12_bag_t bag = NULL;
+ gnutls_pkcs12_bag_type_t bag_type;
+ size_t len, buf_len;
+ static char buf_name[256];
+ static char buf_email[128];
+ unsigned char buf_keyid[32];
+
+ gnutls_pkcs12_t ssl_p12 = NULL;
+ gnutls_x509_crt_t ssl_cert = NULL;
+ gnutls_x509_privkey_t ssl_pkey = NULL;
- for (j=0; ret==0 && j<gnutls_pkcs12_bag_get_count(bag); j++) {
+ Ssl_private_key_t *private_key = g_malloc(sizeof(Ssl_private_key_t));
+ private_key->x509_cert = 0;
+ private_key->x509_pkey = 0;
+ private_key->sexp_pkey = 0;
- bag_type = gnutls_pkcs12_bag_get_type(bag, j);
- if (bag_type >= GNUTLS_BAG_UNKNOWN) continue;
- ssl_debug_printf( "Bag %d/%d: %s\n", i, j, BAGTYPE(bag_type));
- if (bag_type == GNUTLS_BAG_ENCRYPTED) {
- ret = gnutls_pkcs12_bag_decrypt(bag, cert_passwd);
- if (ret == 0) {
- bag_type = gnutls_pkcs12_bag_get_type(bag, j);
- if (bag_type >= GNUTLS_BAG_UNKNOWN) continue;
- ssl_debug_printf( "Bag %d/%d decrypted: %s\n", i, j, BAGTYPE(bag_type));
+ rest = 4096;
+ data.data = g_malloc(rest);
+ data.size = rest;
+ p = data.data;
+ while ((len = fread(p, 1, rest, fp)) > 0) {
+ p += len;
+ rest -= (int) len;
+ if (!rest) {
+ rest = 1024;
+ data.data = g_realloc(data.data, data.size + rest);
+ p = data.data + data.size;
+ data.size += rest;
}
- ret = 0;
- }
+ }
+ data.size -= rest;
+ ssl_debug_printf("%d bytes read\n", data.size);
+ if (!feof(fp)) {
+ ssl_debug_printf( "Error during certificate reading.\n");
+ g_free(private_key);
+ return 0;
+ }
+
+ ret = gnutls_pkcs12_init(&ssl_p12);
+ if (ret < 0) {
+ ssl_debug_printf("gnutls_pkcs12_init(&st_p12) - %s", gnutls_strerror(ret));
+ g_free(private_key);
+ return 0;
+ }
+ ret = gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_DER, 0);
+ g_free(data.data);
+ if (ret < 0) {
+ ssl_debug_printf("gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_DER, 0) - %s\n", gnutls_strerror(ret));
+ g_free(private_key);
+ return 0;
+ }
- ret = gnutls_pkcs12_bag_get_data(bag, j, &data);
- if (ret < 0) continue;
+ ssl_debug_printf( "PKCS#12 imported\n");
- switch (bag_type) {
+ for (i=0; ret==0; i++) {
- case GNUTLS_BAG_CERTIFICATE:
+ if (bag) { gnutls_pkcs12_bag_deinit(bag); bag = NULL; }
- ret = gnutls_x509_crt_init(&ssl_cert);
- if (ret < 0) {
- ssl_debug_printf( "gnutls_x509_crt_init(&ssl_cert) - %s\n", gnutls_strerror(ret));
- g_free(private_key);
- return 0;
- }
+ ret = gnutls_pkcs12_bag_init(&bag);
+ if (ret < 0) continue;
- ret = gnutls_x509_crt_import(ssl_cert, &data, GNUTLS_X509_FMT_DER);
- if (ret < 0) {
- ssl_debug_printf( "gnutls_x509_crt_import(ssl_cert, &data, GNUTLS_X509_FMT_DER) - %s\n", gnutls_strerror(ret));
- g_free(private_key);
- return 0;
- }
-
- buf_len = sizeof(buf_name);
- ret = gnutls_x509_crt_get_dn_by_oid(ssl_cert, GNUTLS_OID_X520_COMMON_NAME, 0, 0, buf_name, &buf_len);
- if (ret < 0) { g_strlcpy(buf_name, "<ERROR>", 256); }
- buf_len = sizeof(buf_email);
- ret = gnutls_x509_crt_get_dn_by_oid(ssl_cert, GNUTLS_OID_PKCS9_EMAIL, 0, 0, buf_email, &buf_len);
- if (ret < 0) { g_strlcpy(buf_email, "<ERROR>", 128); }
-
- buf_len = sizeof(buf_keyid);
- ret = gnutls_x509_crt_get_key_id(ssl_cert, 0, buf_keyid, &buf_len);
- if (ret < 0) { g_strlcpy(buf_keyid, "<ERROR>", 32); }
-
- private_key->x509_cert = ssl_cert;
- ssl_debug_printf( "Certificate imported: %s <%s>, KeyID %s\n", buf_name, buf_email, bytes_to_str(buf_keyid, buf_len));
- break;
-
- case GNUTLS_BAG_PKCS8_KEY:
- case GNUTLS_BAG_PKCS8_ENCRYPTED_KEY:
-
- ret = gnutls_x509_privkey_init(&ssl_pkey);
- if (ret < 0) {
- ssl_debug_printf( "gnutls_x509_privkey_init(&ssl_pkey) - %s\n", gnutls_strerror(ret));
- g_free(private_key);
- return 0;
- }
- ret = gnutls_x509_privkey_import_pkcs8(ssl_pkey, &data, GNUTLS_X509_FMT_DER, cert_passwd,
- (bag_type==GNUTLS_BAG_PKCS8_KEY) ? GNUTLS_PKCS_PLAIN : 0);
- if (ret < 0) {
- ssl_debug_printf( "Can not decrypt private key - %s\n", gnutls_strerror(ret));
- g_free(private_key);
- return 0;
- }
+ ret = gnutls_pkcs12_get_bag(ssl_p12, i, bag);
+ if (ret < 0) continue;
- buf_len = sizeof(buf_keyid);
- ret = gnutls_x509_privkey_get_key_id(ssl_pkey, 0, buf_keyid, &buf_len);
- if (ret < 0) {
- ssl_debug_printf( "gnutls_x509_privkey_get_key_id(ssl_pkey, 0, buf_keyid, &buf_len) - %s\n", gnutls_strerror(ret));
- return 0;
- }
- ssl_debug_printf( "Private key imported: KeyID %s\n", bytes_to_str(buf_keyid, buf_len));
+ for (j=0; ret==0 && j<gnutls_pkcs12_bag_get_count(bag); j++) {
- private_key->x509_pkey = ssl_pkey;
- private_key->sexp_pkey = ssl_privkey_to_sexp(ssl_pkey);
- if ( !private_key->sexp_pkey ) {
- g_free(private_key);
- return NULL;
- }
- break;
+ bag_type = gnutls_pkcs12_bag_get_type(bag, j);
+ if (bag_type >= GNUTLS_BAG_UNKNOWN) continue;
+ ssl_debug_printf( "Bag %d/%d: %s\n", i, j, BAGTYPE(bag_type));
+ if (bag_type == GNUTLS_BAG_ENCRYPTED) {
+ ret = gnutls_pkcs12_bag_decrypt(bag, cert_passwd);
+ if (ret == 0) {
+ bag_type = gnutls_pkcs12_bag_get_type(bag, j);
+ if (bag_type >= GNUTLS_BAG_UNKNOWN) continue;
+ ssl_debug_printf( "Bag %d/%d decrypted: %s\n", i, j, BAGTYPE(bag_type));
+ }
+ ret = 0;
+ }
- default: ;
- }
- } /* j */
- } /* i */
+ ret = gnutls_pkcs12_bag_get_data(bag, j, &data);
+ if (ret < 0) continue;
+
+ switch (bag_type) {
+
+ case GNUTLS_BAG_CERTIFICATE:
+
+ ret = gnutls_x509_crt_init(&ssl_cert);
+ if (ret < 0) {
+ ssl_debug_printf( "gnutls_x509_crt_init(&ssl_cert) - %s\n", gnutls_strerror(ret));
+ g_free(private_key);
+ return 0;
+ }
+
+ ret = gnutls_x509_crt_import(ssl_cert, &data, GNUTLS_X509_FMT_DER);
+ if (ret < 0) {
+ ssl_debug_printf( "gnutls_x509_crt_import(ssl_cert, &data, GNUTLS_X509_FMT_DER) - %s\n", gnutls_strerror(ret));
+ g_free(private_key);
+ return 0;
+ }
+
+ buf_len = sizeof(buf_name);
+ ret = gnutls_x509_crt_get_dn_by_oid(ssl_cert, GNUTLS_OID_X520_COMMON_NAME, 0, 0, buf_name, &buf_len);
+ if (ret < 0) { g_strlcpy(buf_name, "<ERROR>", 256); }
+ buf_len = sizeof(buf_email);
+ ret = gnutls_x509_crt_get_dn_by_oid(ssl_cert, GNUTLS_OID_PKCS9_EMAIL, 0, 0, buf_email, &buf_len);
+ if (ret < 0) { g_strlcpy(buf_email, "<ERROR>", 128); }
+
+ buf_len = sizeof(buf_keyid);
+ ret = gnutls_x509_crt_get_key_id(ssl_cert, 0, buf_keyid, &buf_len);
+ if (ret < 0) { g_strlcpy(buf_keyid, "<ERROR>", 32); }
+
+ private_key->x509_cert = ssl_cert;
+ ssl_debug_printf( "Certificate imported: %s <%s>, KeyID %s\n", buf_name, buf_email, bytes_to_str(buf_keyid, (int) buf_len));
+ break;
+
+ case GNUTLS_BAG_PKCS8_KEY:
+ case GNUTLS_BAG_PKCS8_ENCRYPTED_KEY:
+
+ ret = gnutls_x509_privkey_init(&ssl_pkey);
+ if (ret < 0) {
+ ssl_debug_printf( "gnutls_x509_privkey_init(&ssl_pkey) - %s\n", gnutls_strerror(ret));
+ g_free(private_key);
+ return 0;
+ }
+ ret = gnutls_x509_privkey_import_pkcs8(ssl_pkey, &data, GNUTLS_X509_FMT_DER, cert_passwd,
+ (bag_type==GNUTLS_BAG_PKCS8_KEY) ? GNUTLS_PKCS_PLAIN : 0);
+ if (ret < 0) {
+ ssl_debug_printf( "Can not decrypt private key - %s\n", gnutls_strerror(ret));
+ g_free(private_key);
+ return 0;
+ }
+
+ if (gnutls_x509_privkey_get_pk_algorithm(ssl_pkey) != GNUTLS_PK_RSA) {
+ ssl_debug_printf("ssl_load_pkcs12: private key public key algorithm isn't RSA\n");
+ g_free(private_key);
+ return 0;
+ }
+
+ private_key->x509_pkey = ssl_pkey;
+ private_key->sexp_pkey = ssl_privkey_to_sexp(ssl_pkey);
+ if ( !private_key->sexp_pkey ) {
+ g_free(private_key);
+ return NULL;
+ }
+ break;
+
+ default: ;
+ }
+ } /* j */
+ } /* i */
- return private_key;
+ return private_key;
}
gcry_sexp_release(key->sexp_pkey);
#endif
- if (!key->x509_cert)
- gnutls_x509_crt_deinit (key->x509_cert);
+ if (!key->x509_cert)
+ gnutls_x509_crt_deinit (key->x509_cert);
+
+ if (!key->x509_pkey)
+ gnutls_x509_privkey_deinit(key->x509_pkey);
+
+ g_free((Ssl_private_key_t*)key);
+}
+
+gint
+ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree* associations, packet_info *pinfo) {
+ SslService dummy;
+ char ip_addr_any[] = {0,0,0,0};
+ guint32 port = 0;
+ Ssl_private_key_t * private_key;
+
+ /* we need to know which side of the conversation is speaking */
+ if (ssl_packet_from_server(ssl_session, associations, pinfo)) {
+ dummy.addr = pinfo->src;
+ dummy.port = port = pinfo->srcport;
+ } else {
+ dummy.addr = pinfo->dst;
+ dummy.port = port = pinfo->destport;
+ }
+ ssl_debug_printf("ssl_find_private_key server %s:%u\n",
+ ep_address_to_str(&dummy.addr),dummy.port);
+
+ /* try to retrieve private key for this service. Do it now 'cause pinfo
+ * is not always available
+ * Note that with HAVE_LIBGNUTLS undefined private_key is allways 0
+ * and thus decryption never engaged*/
+
+
+ ssl_session->private_key = 0;
+ private_key = g_hash_table_lookup(key_hash, &dummy);
- if (!key->x509_pkey)
- gnutls_x509_privkey_deinit(key->x509_pkey);
+ if (!private_key) {
+ ssl_debug_printf("ssl_find_private_key can't find private key for this server! Try it again with universal port 0\n");
+
+ dummy.port = 0;
+ private_key = g_hash_table_lookup(key_hash, &dummy);
+ }
- g_free((Ssl_private_key_t*)key);
+ if (!private_key) {
+ ssl_debug_printf("ssl_find_private_key can't find private key for this server (universal port)! Try it again with universal address 0.0.0.0\n");
+
+ dummy.addr.type = AT_IPv4;
+ dummy.addr.len = 4;
+ dummy.addr.data = ip_addr_any;
+
+ dummy.port = port;
+ private_key = g_hash_table_lookup(key_hash, &dummy);
+ }
+
+ if (!private_key) {
+ ssl_debug_printf("ssl_find_private_key can't find any private key!\n");
+ } else {
+ ssl_session->private_key = private_key->sexp_pkey;
+ }
+
+ return 0;
}
void
sscanf(str, "%d.%d.%d", &ver_major, &ver_minor, &ver_patch);
}
-#else /* HAVE_LIBGNUTLS */
+#else /* defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT) */
/* no libgnutl: dummy operation to keep interface consistent*/
void
ssl_lib_init(void)
{
}
+gint
+ssl_find_private_key(SslDecryptSession *ssl_session _U_, GHashTable *key_hash _U_, GTree* associations _U_, packet_info *pinfo _U_)
+{
+ return 0;
+}
+
int
ssl_find_cipher(int num,SslCipherSuite* cs)
{
void
ssl_change_cipher(SslDecryptSession *ssl_session, gboolean server)
{
- ssl_debug_printf("ssl_change_cipher %s: makes no sence without gnutls. ssl %p\n",
+ ssl_debug_printf("ssl_change_cipher %s: makes no sense without gnutls. ssl %p\n",
(server)?"SERVER":"CLIENT", ssl_session);
}
int
ssl_decrypt_pre_master_secret(SslDecryptSession* ssl_session,
- StringInfo* entrypted_pre_master, SSL_PRIVATE_KEY *pk)
+ StringInfo* encrypted_pre_master, SSL_PRIVATE_KEY *pk)
{
ssl_debug_printf("ssl_decrypt_pre_master_secret: impossible without gnutls."
- " ssl %p entrypted_pre_master %p pk %p\n", ssl_session,
- entrypted_pre_master, pk);
+ " ssl %p encrypted_pre_master %p pk %p\n", ssl_session,
+ encrypted_pre_master, pk);
return 0;
}
void
ssl_session_init(SslDecryptSession* ssl_session)
{
- ssl_debug_printf("ssl_session_init: initializing ptr %p size %lu\n",
- (void *)ssl_session, (gulong)sizeof(SslDecryptSession));
+ ssl_debug_printf("ssl_session_init: initializing ptr %p size %" G_GSIZE_MODIFIER "u\n",
+ (void *)ssl_session, sizeof(SslDecryptSession));
ssl_session->master_secret.data = ssl_session->_master_secret;
ssl_session->session_id.data = ssl_session->_session_id;
ssl_session->client_data_for_iv.data = ssl_session->_client_data_for_iv;
ssl_session->app_data_segment.data=NULL;
ssl_session->app_data_segment.data_len=0;
+ SET_ADDRESS(&ssl_session->srv_addr, AT_NONE, 0, NULL);
+ ssl_session->srv_ptype = PT_NONE;
+ ssl_session->srv_port = 0;
+}
+
+void
+ssl_set_server(SslDecryptSession* ssl, address *addr, port_type ptype, guint32 port)
+{
+ SE_COPY_ADDRESS(&ssl->srv_addr, addr);
+ ssl->srv_ptype = ptype;
+ ssl->srv_port = port;
}
/* Hash Functions for TLS/DTLS sessions table and private keys table*/
gint
ssl_equal (gconstpointer v, gconstpointer v2)
{
- const StringInfo *val1;
- const StringInfo *val2;
- val1 = (const StringInfo *)v;
- val2 = (const StringInfo *)v2;
+ const StringInfo *val1;
+ const StringInfo *val2;
+ val1 = (const StringInfo *)v;
+ val2 = (const StringInfo *)v2;
- if (val1->data_len == val2->data_len &&
- !memcmp(val1->data, val2->data, val2->data_len)) {
- return 1;
- }
- return 0;
+ if (val1->data_len == val2->data_len &&
+ !memcmp(val1->data, val2->data, val2->data_len)) {
+ return 1;
+ }
+ return 0;
}
guint
ssl_hash (gconstpointer v)
{
- guint l,hash;
- const StringInfo* id;
- const guint* cur;
- hash = 0;
- id = (const StringInfo*) v;
-
- /* id and id->data are mallocated in ssl_save_session(). As such 'data'
- * should be aligned for any kind of access (for example as a guint as
- * is done below). The intermediate void* cast is to prevent "cast
- * increases required alignment of target type" warnings on CPUs (such
- * as SPARCs) that do not allow misaligned memory accesses.
- */
- cur = (const guint*)(void*) id->data;
+ guint l,hash;
+ const StringInfo* id;
+ const guint* cur;
+ hash = 0;
+ id = (const StringInfo*) v;
+
+ /* id and id->data are mallocated in ssl_save_session(). As such 'data'
+ * should be aligned for any kind of access (for example as a guint as
+ * is done below). The intermediate void* cast is to prevent "cast
+ * increases required alignment of target type" warnings on CPUs (such
+ * as SPARCs) that do not allow misaligned memory accesses.
+ */
+ cur = (const guint*)(void*) id->data;
- for (l=4; (l < id->data_len); l+=4, cur++)
- hash = hash ^ (*cur);
+ for (l=4; (l < id->data_len); l+=4, cur++)
+ hash = hash ^ (*cur);
- return hash;
+ return hash;
}
gint
ssl_private_key_equal (gconstpointer v, gconstpointer v2)
{
- const SslService *val1;
- const SslService *val2;
- val1 = (const SslService *)v;
- val2 = (const SslService *)v2;
+ const SslService *val1;
+ const SslService *val2;
+ val1 = (const SslService *)v;
+ val2 = (const SslService *)v2;
- if ((val1->port == val2->port) &&
- ! CMP_ADDRESS(&val1->addr, &val2->addr)) {
- return 1;
- }
- return 0;
+ if ((val1->port == val2->port) &&
+ ! CMP_ADDRESS(&val1->addr, &val2->addr)) {
+ return 1;
+ }
+ return 0;
}
guint
ssl_private_key_hash (gconstpointer v)
{
- const SslService *key;
- guint l, hash, len ;
- const guint* cur;
- key = (const SslService *)v;
- hash = key->port;
- len = key->addr.len;
- cur = (const guint*) key->addr.data;
+ const SslService *key;
+ guint l, hash, len ;
+ const guint* cur;
+ key = (const SslService *)v;
+ hash = key->port;
+ len = key->addr.len;
+ cur = (const guint*) key->addr.data;
- for (l=4; (l<len); l+=4, cur++)
- hash = hash ^ (*cur);
+ for (l=4; (l<len); l+=4, cur++)
+ hash = hash ^ (*cur);
- return hash;
+ return hash;
}
/* private key table entries have a scope 'larger' then packet capture,
void
ssl_private_key_free(gpointer id, gpointer key, gpointer dummy _U_)
{
- g_free(id);
- ssl_free_key((Ssl_private_key_t*) key);
+ if (id != NULL) {
+ g_free(id);
+ ssl_free_key((Ssl_private_key_t*) key);
+ }
}
/* handling of association between tls/dtls ports and clear text protocol */
ssl_association_add(GTree* associations, dissector_handle_t handle, guint port, const gchar *protocol, gboolean tcp, gboolean from_key_list)
{
- SslAssociation* assoc;
- assoc = g_malloc(sizeof(SslAssociation));
+ SslAssociation* assoc;
+ assoc = g_malloc(sizeof(SslAssociation));
- assoc->tcp = tcp;
- assoc->ssl_port = port;
- assoc->info=g_malloc(strlen(protocol)+1);
- g_strlcpy(assoc->info, protocol, strlen(protocol)+1);
- assoc->handle = find_dissector(protocol);
- assoc->from_key_list = from_key_list;
+ assoc->tcp = tcp;
+ assoc->ssl_port = port;
+ assoc->info=g_strdup(protocol);
+ assoc->handle = find_dissector(protocol);
+ assoc->from_key_list = from_key_list;
- ssl_debug_printf("association_add %s port %d protocol %s handle %p\n",
- (assoc->tcp)?"TCP":"UDP", port, protocol, (void *)(assoc->handle));
+ ssl_debug_printf("association_add %s port %d protocol %s handle %p\n",
+ (assoc->tcp)?"TCP":"UDP", port, protocol, (void *)(assoc->handle));
- if (!assoc->handle) {
- ssl_debug_printf("association_add could not find handle for protocol '%s', try to find 'data' dissector\n", protocol);
- assoc->handle = find_dissector("data");
- }
+ if (!assoc->handle) {
+ ssl_debug_printf("association_add could not find handle for protocol '%s', try to find 'data' dissector\n", protocol);
+ assoc->handle = find_dissector("data");
+ }
- if(!assoc->handle) {
- fprintf(stderr, "association_add() could not find handle for protocol:%s\n",protocol);
- } else {
- if(port) {
- if(tcp)
- dissector_add("tcp.port", port, handle);
- else
- dissector_add("udp.port", port, handle);
+ if(!assoc->handle) {
+ fprintf(stderr, "association_add() could not find handle for protocol:%s\n",protocol);
+ } else {
+ if(port) {
+ if(tcp)
+ dissector_add_uint("tcp.port", port, handle);
+ else
+ dissector_add_uint("udp.port", port, handle);
+ }
+ g_tree_insert(associations, assoc, assoc);
}
- g_tree_insert(associations, assoc, assoc);
- }
}
void
ssl_association_remove(GTree* associations, SslAssociation *assoc)
{
- ssl_debug_printf("ssl_association_remove removing %s %u - %s handle %p\n",
- (assoc->tcp)?"TCP":"UDP", assoc->ssl_port, assoc->info, (void *)(assoc->handle));
- if (assoc->handle)
- dissector_delete((assoc->tcp)?"tcp.port":"udp.port", assoc->ssl_port, assoc->handle);
+ ssl_debug_printf("ssl_association_remove removing %s %u - %s handle %p\n",
+ (assoc->tcp)?"TCP":"UDP", assoc->ssl_port, assoc->info, (void *)(assoc->handle));
+ if (assoc->handle)
+ dissector_delete_uint((assoc->tcp)?"tcp.port":"udp.port", assoc->ssl_port, assoc->handle);
- g_tree_remove(associations, assoc);
- g_free(assoc);
+ g_free(assoc->info);
+
+ g_tree_remove(associations, assoc);
+ g_free(assoc);
}
gint
ssl_association_cmp(gconstpointer a, gconstpointer b)
{
- const SslAssociation *assoc_a=a, *assoc_b=b;
- if (assoc_a->tcp != assoc_b->tcp) return (assoc_a->tcp)?1:-1;
- return assoc_a->ssl_port - assoc_b->ssl_port;
+ const SslAssociation *assoc_a=a, *assoc_b=b;
+ if (assoc_a->tcp != assoc_b->tcp) return (assoc_a->tcp)?1:-1;
+ return assoc_a->ssl_port - assoc_b->ssl_port;
}
SslAssociation*
ssl_association_find(GTree * associations, guint port, gboolean tcp)
{
- register SslAssociation* ret;
- SslAssociation assoc_tmp;
+ register SslAssociation* ret;
+ SslAssociation assoc_tmp;
- assoc_tmp.tcp = tcp;
- assoc_tmp.ssl_port = port;
- ret = g_tree_lookup(associations, &assoc_tmp);
+ assoc_tmp.tcp = tcp;
+ assoc_tmp.ssl_port = port;
+ ret = g_tree_lookup(associations, &assoc_tmp);
- ssl_debug_printf("association_find: %s port %d found %p\n", (tcp)?"TCP":"UDP", port, (void *)ret);
- return ret;
+ ssl_debug_printf("association_find: %s port %d found %p\n", (tcp)?"TCP":"UDP", port, (void *)ret);
+ return ret;
}
gint
ssl_assoc_from_key_list(gpointer key _U_, gpointer data, gpointer user_data)
{
- if (((SslAssociation*)data)->from_key_list)
- ep_stack_push((ep_stack_t)user_data, data);
- return FALSE;
+ if (((SslAssociation*)data)->from_key_list)
+ ep_stack_push((ep_stack_t)user_data, data);
+ return FALSE;
}
int
-ssl_packet_from_server(GTree* associations, guint port, gboolean tcp)
+ssl_packet_from_server(SslDecryptSession* ssl, GTree* associations, packet_info *pinfo)
{
- register gint ret;
- ret = ssl_association_find(associations, port, tcp) != 0;
+ gint ret;
+ if (ssl && (ssl->srv_ptype != PT_NONE)) {
+ ret = (ssl->srv_ptype == pinfo->ptype) && (ssl->srv_port == pinfo->srcport) && ADDRESSES_EQUAL(&ssl->srv_addr, &pinfo->src);
+ } else {
+ ret = ssl_association_find(associations, pinfo->srcport, pinfo->ptype == PT_TCP) != 0;
+ }
- ssl_debug_printf("packet_from_server: is from server - %s\n", (ret)?"TRUE":"FALSE");
- return ret;
+ ssl_debug_printf("packet_from_server: is from server - %s\n", (ret)?"TRUE":"FALSE");
+ return ret;
}
/* add to packet data a newly allocated tvb with the specified real data*/
void
ssl_add_record_info(gint proto, packet_info *pinfo, guchar* data, gint data_len, gint record_id)
{
- guchar* real_data;
- SslRecordInfo* rec;
- SslPacketInfo* pi;
- real_data = se_alloc(data_len);
- rec = se_alloc(sizeof(SslRecordInfo));
- pi = p_get_proto_data(pinfo->fd, proto);
+ guchar* real_data;
+ SslRecordInfo* rec;
+ SslPacketInfo* pi;
+ real_data = se_alloc(data_len);
+ rec = se_alloc(sizeof(SslRecordInfo));
+ pi = p_get_proto_data(pinfo->fd, proto);
- if (!pi)
+ if (!pi)
{
- pi = se_alloc0(sizeof(SslPacketInfo));
- p_add_proto_data(pinfo->fd, proto,pi);
+ pi = se_alloc0(sizeof(SslPacketInfo));
+ p_add_proto_data(pinfo->fd, proto,pi);
}
- rec->id = record_id;
- rec->tvb = tvb_new_real_data(real_data, data_len, data_len);
- memcpy(real_data, data, data_len);
+ rec->id = record_id;
+ rec->tvb = tvb_new_real_data(real_data, data_len, data_len);
+ memcpy(real_data, data, data_len);
- /* head insertion */
- rec->next= pi->handshake_data;
- pi->handshake_data = rec;
+ /* head insertion */
+ rec->next= pi->handshake_data;
+ pi->handshake_data = rec;
}
tvbuff_t*
ssl_get_record_info(int proto, packet_info *pinfo, gint record_id)
{
- SslRecordInfo* rec;
- SslPacketInfo* pi;
- pi = p_get_proto_data(pinfo->fd, proto);
+ SslRecordInfo* rec;
+ SslPacketInfo* pi;
+ pi = p_get_proto_data(pinfo->fd, proto);
- if (!pi)
- return NULL;
+ if (!pi)
+ return NULL;
- for (rec = pi->handshake_data; rec; rec = rec->next)
- if (rec->id == record_id)
- return rec->tvb;
+ for (rec = pi->handshake_data; rec; rec = rec->next)
+ if (rec->id == record_id)
+ return rec->tvb;
- return NULL;
+ return NULL;
}
void
ssl_add_data_info(gint proto, packet_info *pinfo, guchar* data, gint data_len, gint key, SslFlow *flow)
{
- SslDataInfo *rec, **prec;
- SslPacketInfo *pi;
+ SslDataInfo *rec, **prec;
+ SslPacketInfo *pi;
- pi = p_get_proto_data(pinfo->fd, proto);
- if (!pi)
+ pi = p_get_proto_data(pinfo->fd, proto);
+ if (!pi)
{
- pi = se_alloc0(sizeof(SslPacketInfo));
- p_add_proto_data(pinfo->fd, proto,pi);
+ pi = se_alloc0(sizeof(SslPacketInfo));
+ p_add_proto_data(pinfo->fd, proto,pi);
}
- rec = se_alloc(sizeof(SslDataInfo)+data_len);
- rec->key = key;
- rec->plain_data.data = (guchar*)(rec + 1);
- memcpy(rec->plain_data.data, data, data_len);
- rec->plain_data.data_len = data_len;
- rec->seq = flow->byte_seq;
- rec->nxtseq = flow->byte_seq + data_len;
- rec->flow = flow;
- rec->next = NULL;
-
- flow->byte_seq += data_len;
+ rec = se_alloc(sizeof(SslDataInfo)+data_len);
+ rec->key = key;
+ rec->plain_data.data = (guchar*)(rec + 1);
+ memcpy(rec->plain_data.data, data, data_len);
+ rec->plain_data.data_len = data_len;
+ if (flow)
+ {
+ rec->seq = flow->byte_seq;
+ rec->nxtseq = flow->byte_seq + data_len;
+ rec->flow = flow;
+ flow->byte_seq += data_len;
+ }
+ rec->next = NULL;
- /* insertion */
- prec = &pi->appl_data;
- while (*prec) prec = &(*prec)->next;
- *prec = rec;
+ /* insertion */
+ prec = &pi->appl_data;
+ while (*prec) prec = &(*prec)->next;
+ *prec = rec;
- ssl_debug_printf("ssl_add_data_info: new data inserted data_len = %d, seq = %u, nxtseq = %u\n",
- rec->plain_data.data_len, rec->seq, rec->nxtseq);
+ ssl_debug_printf("ssl_add_data_info: new data inserted data_len = %d, seq = %u, nxtseq = %u\n",
+ rec->plain_data.data_len, rec->seq, rec->nxtseq);
}
SslDataInfo*
ssl_get_data_info(int proto, packet_info *pinfo, gint key)
{
- SslDataInfo* rec;
- SslPacketInfo* pi;
- pi = p_get_proto_data(pinfo->fd, proto);
+ SslDataInfo* rec;
+ SslPacketInfo* pi;
+ pi = p_get_proto_data(pinfo->fd, proto);
- if (!pi) return NULL;
+ if (!pi) return NULL;
- rec = pi->appl_data;
- while (rec) {
- if (rec->key == key) return rec;
- rec = rec->next;
- }
+ rec = pi->appl_data;
+ while (rec) {
+ if (rec->key == key) return rec;
+ rec = rec->next;
+ }
- return NULL;
+ return NULL;
}
/* initialize/reset per capture state data (ssl sessions cache) */
void
ssl_common_init(GHashTable **session_hash, StringInfo *decrypted_data, StringInfo *compressed_data)
{
- if (*session_hash)
- g_hash_table_destroy(*session_hash);
- *session_hash = g_hash_table_new(ssl_hash, ssl_equal);
+ if (*session_hash)
+ g_hash_table_destroy(*session_hash);
+ *session_hash = g_hash_table_new(ssl_hash, ssl_equal);
- if (decrypted_data->data)
g_free(decrypted_data->data);
- ssl_data_alloc(decrypted_data, 32);
+ ssl_data_alloc(decrypted_data, 32);
- if (compressed_data->data)
g_free(compressed_data->data);
- ssl_data_alloc(compressed_data, 32);
+ ssl_data_alloc(compressed_data, 32);
}
/* parse ssl related preferences (private keys and ports association strings) */
void
-ssl_parse_key_list(const gchar * keys_list, GHashTable *key_hash, GTree* associations, dissector_handle_t handle, gboolean tcp)
-{
- gchar* end;
- gchar* start;
- gchar* tmp;
- guchar* ip;
- SslService* service;
- Ssl_private_key_t * private_key, *tmp_private_key;
- FILE* fp;
-
- start = g_strdup(keys_list);
- tmp = start;
- ssl_debug_printf("ssl_init keys string:\n%s\n", start);
- do {
- int read_index, write_index;
- gchar* addr, *port, *protocol, *filename, *cert_passwd;
-
- addr = start;
- /* split ip/file couple with ';' separator*/
- end = strpbrk(start, ";\n\r");
- if (end) {
- *end = 0;
- start = end+1;
- }
-
- /* skip comments (in file) */
- if (addr[0] == '#') continue;
-
- /* for each entry split ip, port, protocol, filename with ',' separator */
- ssl_debug_printf("ssl_init found host entry %s\n", addr);
- port = strchr(addr, ',');
- if (!port)
- {
- ssl_debug_printf("ssl_init entry malformed can't find port in '%s'\n", addr);
- continue;
- }
- *port = 0;
- port++;
+ssl_parse_key_list(const ssldecrypt_assoc_t * uats, GHashTable *key_hash, GTree* associations, dissector_handle_t handle, gboolean tcp)
+{
+ SslService* service;
+ Ssl_private_key_t * private_key, *tmp_private_key;
+ FILE* fp = NULL;
+ guint32 addr_data[4];
+ int addr_len, at;
+ address_type addr_type[2] = { AT_IPv4, AT_IPv6 };
- protocol = strchr(port,',');
- if (!protocol)
- {
- ssl_debug_printf("ssl_init entry malformed can't find protocol in %s\n", port);
- continue;
+ /* try to load keys file first */
+ fp = ws_fopen(uats->keyfile, "rb");
+ if (!fp) {
+ fprintf(stderr, "Can't open file %s\n",uats->keyfile);
+ return;
}
- *protocol=0;
- protocol++;
- filename = strchr(protocol,',');
- if (!filename)
- {
- ssl_debug_printf("ssl_init entry malformed can't find filename in %s\n", protocol);
- continue;
+ if ((gint)strlen(uats->password) == 0) {
+ private_key = ssl_load_key(fp);
+ } else {
+ private_key = ssl_load_pkcs12(fp, uats->password);
}
- *filename=0;
- filename++;
- cert_passwd = strchr(filename,',');
- if (cert_passwd)
- {
- *cert_passwd=0;
- cert_passwd++;
+ if (!private_key) {
+ fprintf(stderr,"Can't load private key from %s\n", uats->keyfile);
+ return;
}
- /* convert ip and port string to network rappresentation*/
- service = g_malloc(sizeof(SslService) + 4);
- service->addr.type = AT_IPv4;
- service->addr.len = 4;
- service->addr.data = ip = ((guchar*)service) + sizeof(SslService);
+ fclose(fp);
- /* remove all spaces in addr */
- read_index = 0;
- write_index = 0;
+ for (at = 0; at < 2; at++) {
+ memset(addr_data, 0, sizeof(addr_data));
+ addr_len = 0;
- while(addr[read_index]) {
- if (addr[read_index] != ' ') {
- addr[write_index] = addr[read_index];
- write_index++;
- }
- read_index++;
- }
- addr[write_index] = 0;
+ /* any: IPv4 or IPv6 wildcard */
+ /* anyipv4: IPv4 wildcard */
+ /* anyipv6: IPv6 wildcard */
- if ( !strcmp("any", addr) || !strcmp("ANY", addr) ) {
- ip[0] = 0;
- ip[1] = 0;
- ip[2] = 0;
- ip[3] = 0;
- } else {
- sscanf(addr, "%hhu.%hhu.%hhu.%hhu", &ip[0], &ip[1], &ip[2], &ip[3]);
- }
+ if(addr_type[at] == AT_IPv4) {
+ if (strcmp(uats->ipaddr, "any") == 0 || strcmp(uats->ipaddr, "anyipv4") == 0 ||
+ get_host_ipaddr(uats->ipaddr, &addr_data[0])) {
+ addr_len = 4;
+ }
+ } else { /* AT_IPv6 */
+ if(strcmp(uats->ipaddr, "any") == 0 || strcmp(uats->ipaddr, "anyipv6") == 0 ||
+ get_host_ipaddr6(uats->ipaddr, (struct e_in6_addr *) addr_data)) {
+ addr_len = 16;
+ }
+ }
- if(!strcmp("start_tls", port)) {
- service->port = 0;
- } else {
- service->port = atoi(port);
- }
- ssl_debug_printf("ssl_init addr '%hhu.%hhu.%hhu.%hhu' port '%d' filename '%s' password(only for p12 file) '%s'\n",
- ip[0], ip[1], ip[2], ip[3], service->port, filename, cert_passwd);
+ if (! addr_len) {
+ continue;
+ }
- /* try to load pen or p12 file*/
- fp = ws_fopen(filename, "rb");
- if (!fp) {
- fprintf(stderr, "can't open file %s \n",filename);
- continue;
- }
+ service = g_malloc(sizeof(SslService) + addr_len);
+ service->addr.type = addr_type[at];
+ service->addr.len = addr_len;
+ service->addr.data = ((guchar*)service) + sizeof(SslService);
+ memcpy((void*)service->addr.data, addr_data, addr_len);
- if (!cert_passwd) {
- private_key = ssl_load_key(fp);
- }
- else
- {
- private_key = ssl_load_pkcs12(fp,cert_passwd);
- }
- /* !!! */
- if (!private_key) {
- fprintf(stderr,"can't load private key from %s\n",
- filename);
- continue;
- }
+ if(strcmp(uats->port,"start_tls")==0) {
+ service->port = 0;
+ } else {
+ service->port = atoi(uats->port);
+ }
- fclose(fp);
+ ssl_debug_printf("ssl_init %s addr '%s' (%s) port '%d' filename '%s' password(only for p12 file) '%s'\n",
+ (addr_type[at] == AT_IPv4) ? "IPv4" : "IPv6", uats->ipaddr, ep_address_to_str(&service->addr),
+ service->port, uats->keyfile, uats->password);
- ssl_debug_printf("ssl_init private key file %s successfully loaded\n",filename);
+ ssl_debug_printf("ssl_init private key file %s successfully loaded.\n", uats->keyfile);
- /* if item exists, remove first */
- tmp_private_key = g_hash_table_lookup(key_hash, service);
- if (tmp_private_key) {
- g_hash_table_remove(key_hash, service);
- ssl_free_key(tmp_private_key);
- }
- g_hash_table_insert(key_hash, service, private_key);
+ /* if item exists, remove first */
+ tmp_private_key = g_hash_table_lookup(key_hash, service);
+ if (tmp_private_key) {
+ g_hash_table_remove(key_hash, service);
+ ssl_free_key(tmp_private_key);
+ }
- ssl_association_add(associations, handle, service->port, protocol, tcp, TRUE);
+ g_hash_table_insert(key_hash, service, private_key);
- } while (end != NULL);
- g_free(tmp);
+ ssl_association_add(associations, handle, service->port, uats->protocol, tcp, TRUE);
+ }
}
/* store master secret into session data cache */
void
ssl_save_session(SslDecryptSession* ssl, GHashTable *session_hash)
{
- /* allocate stringinfo chunks for session id and master secret data*/
- StringInfo* session_id;
- StringInfo* master_secret;
- session_id = se_alloc0(sizeof(StringInfo) + ssl->session_id.data_len);
- master_secret = se_alloc0(48 + sizeof(StringInfo));
+ /* allocate stringinfo chunks for session id and master secret data*/
+ StringInfo* session_id;
+ StringInfo* master_secret;
+ session_id = se_alloc0(sizeof(StringInfo) + ssl->session_id.data_len);
+ master_secret = se_alloc0(48 + sizeof(StringInfo));
- master_secret->data = ((guchar*)master_secret+sizeof(StringInfo));
+ master_secret->data = ((guchar*)master_secret+sizeof(StringInfo));
- /* ssl_hash() depends on session_id->data being aligned for guint access
- * so be careful in changing how it is allocated.
- */
- session_id->data = ((guchar*)session_id+sizeof(StringInfo));
+ /* ssl_hash() depends on session_id->data being aligned for guint access
+ * so be careful in changing how it is allocated.
+ */
+ session_id->data = ((guchar*)session_id+sizeof(StringInfo));
- ssl_data_set(session_id, ssl->session_id.data, ssl->session_id.data_len);
- ssl_data_set(master_secret, ssl->master_secret.data, ssl->master_secret.data_len);
- g_hash_table_insert(session_hash, session_id, master_secret);
- ssl_print_string("ssl_save_session stored session id", session_id);
- ssl_print_string("ssl_save_session stored master secret", master_secret);
+ ssl_data_set(session_id, ssl->session_id.data, ssl->session_id.data_len);
+ ssl_data_set(master_secret, ssl->master_secret.data, ssl->master_secret.data_len);
+ g_hash_table_insert(session_hash, session_id, master_secret);
+ ssl_print_string("ssl_save_session stored session id", session_id);
+ ssl_print_string("ssl_save_session stored master secret", master_secret);
}
void
ssl_restore_session(SslDecryptSession* ssl, GHashTable *session_hash)
{
- StringInfo* ms;
- ms = g_hash_table_lookup(session_hash, &ssl->session_id);
+ StringInfo* ms;
+ ms = g_hash_table_lookup(session_hash, &ssl->session_id);
- if (!ms) {
- ssl_debug_printf("ssl_restore_session can't find stored session\n");
- return;
- }
- ssl_data_set(&ssl->master_secret, ms->data, ms->data_len);
- ssl->state |= SSL_MASTER_SECRET;
- ssl_debug_printf("ssl_restore_session master key retrieved\n");
+ if (!ms) {
+ ssl_debug_printf("ssl_restore_session can't find stored session\n");
+ return;
+ }
+ ssl_data_set(&ssl->master_secret, ms->data, ms->data_len);
+ ssl->state |= SSL_MASTER_SECRET;
+ ssl_debug_printf("ssl_restore_session master key retrieved\n");
}
int
ssl_is_valid_content_type(guint8 type)
{
- if (type >= 0x14 && type <= 0x17)
+ if (type >= 0x14 && type <= 0x17)
{
- return 1;
+ return 1;
}
- return 0;
+ return 0;
+}
+
+static guint8
+from_hex_char(gchar c) {
+ if (c >= '0' && c <= '9')
+ return c - '0';
+ if (c >= 'A' && c <= 'F')
+ return c - 'A' + 10;
+ if (c >= 'a' && c <= 'f')
+ return c - 'a' + 10;
+ return 16;
+}
+
+int
+ssl_keylog_lookup(SslDecryptSession* ssl_session,
+ const gchar* ssl_keylog_filename,
+ StringInfo* encrypted_pre_master) {
+ static const unsigned int kRSAPremasterLength = 48; /* RFC5246 7.4.7.1 */
+ FILE* ssl_keylog;
+ gsize bytes_read;
+ int ret = -1;
+
+ ssl_debug_printf("trying to use SSL keylog in %s\n", ssl_keylog_filename);
+
+ ssl_keylog = ws_fopen(ssl_keylog_filename, "r");
+ if (!ssl_keylog) {
+ ssl_debug_printf("failed to open SSL keylog\n");
+ return -1;
+ }
+
+ /* The format of the file is a series of records with one of the following formats:
+ * - "RSA xxxx yyyy"
+ * Where xxxx are the first 8 bytes of the encrypted pre-master secret (hex-encoded)
+ * Where yyyy is the cleartext pre-master secret (hex-encoded)
+ * (this is the original format introduced with bug 4349)
+ *
+ * - "RSA Sesion-ID:xxxx Master-Key:yyyy"
+ * Where xxxx is the SSL session ID (hex-encoded)
+ * Where yyyy is the cleartext master secret (hex-encoded)
+ * (added to support openssl s_client Master-Key output)
+ */
+ for (;;) {
+ char buf[512], *line;
+ unsigned int i;
+ unsigned int offset;
+
+ line = fgets(buf, sizeof(buf), ssl_keylog);
+ if (!line)
+ break;
+
+ bytes_read = strlen(line);
+ /* fgets includes the \n at the end of the line. */
+ if (bytes_read > 0) {
+ line[bytes_read - 1] = 0;
+ bytes_read--;
+ }
+
+ ssl_debug_printf(" checking keylog line: %s\n", line);
+
+ if ( memcmp(line, "RSA ", 4) != 0) {
+ ssl_debug_printf(" rejecting line due to bad format\n");
+ continue;
+ }
+
+ offset = 4;
+
+ if ( ssl_session->session_id.data_len>0 && memcmp(line+offset,"Session-ID:",11) == 0 ) {
+ offset += 11;
+ for (i = 0; i < ssl_session->session_id.data_len; i++) {
+ if (from_hex_char(line[offset + i*2]) != (ssl_session->session_id.data[i] >> 4) ||
+ from_hex_char(line[offset + i*2 + 1]) != (ssl_session->session_id.data[i] & 15)) {
+ line = NULL;
+ break;
+ }
+ }
+
+ if (line == NULL) {
+ ssl_debug_printf(" line does not match SSL-ID\n");
+ continue;
+ }
+
+ offset += 2*ssl_session->session_id.data_len;
+ offset++;
+
+ } else if( line[offset+16] == ' ' ) {
+ for (i = 0; i < 8; i++) {
+ if (from_hex_char(line[offset + i*2]) != (encrypted_pre_master->data[i] >> 4) ||
+ from_hex_char(line[offset + i*2 + 1]) != (encrypted_pre_master->data[i] & 15)) {
+ line = NULL;
+ break;
+ }
+ }
+
+ if (line == NULL) {
+ ssl_debug_printf(" line does not match encrypted pre-master secret\n");
+ continue;
+ }
+
+ offset += 17;
+
+ } else {
+ ssl_debug_printf(" rejecting line due to bad format\n");
+ continue;
+ }
+
+
+ /* This record seems to match. */
+ if (memcmp(line+offset, "Master-Key:", 11) == 0) {
+ /* Key is a MasterSecret */
+ offset += 11;
+ ssl_session->master_secret.data = se_alloc(kRSAPremasterLength);
+ for (i = 0; i < kRSAPremasterLength; i++) {
+ guint8 a = from_hex_char(line[offset + i*2]);
+ guint8 b = from_hex_char(line[offset + i*2 + 1]);
+ if (a == 16 || b == 16) {
+ line = NULL;
+ break;
+ }
+ ssl_session->master_secret.data[i] = a << 4 | b;
+ }
+
+ if (line == NULL) {
+ ssl_debug_printf(" line contains non-hex chars in master secret\n");
+ continue;
+ }
+
+ ssl_session->master_secret.data_len = kRSAPremasterLength;
+ ssl_session->state &= ~(SSL_PRE_MASTER_SECRET|SSL_HAVE_SESSION_KEY);
+ ssl_session->state |= SSL_MASTER_SECRET;
+ ssl_debug_printf("found master secret in key log\n");
+ ret = 0;
+ break;
+
+ } else {
+ /* Key is a PreMasterSecret */
+ ssl_session->pre_master_secret.data = se_alloc(kRSAPremasterLength);
+ for (i = 0; i < kRSAPremasterLength; i++) {
+ guint8 a = from_hex_char(line[offset + i*2]);
+ guint8 b = from_hex_char(line[offset + i*2 + 1]);
+ if (a == 16 || b == 16) {
+ line = NULL;
+ break;
+ }
+ ssl_session->pre_master_secret.data[i] = a << 4 | b;
+ }
+
+ if (line == NULL) {
+ ssl_debug_printf(" line contains non-hex chars in pre-master secret\n");
+ continue;
+ }
+
+ ssl_session->pre_master_secret.data_len = kRSAPremasterLength;
+ ssl_session->state &= ~(SSL_MASTER_SECRET|SSL_HAVE_SESSION_KEY);
+ ssl_session->state |= SSL_PRE_MASTER_SECRET;
+ ssl_debug_printf("found pre-master secret in key log\n");
+ ret = 0;
+ break;
+ }
+ }
+
+ fclose(ssl_keylog);
+ return ret;
}
#ifdef SSL_DECRYPT_DEBUG
void
ssl_debug_flush(void)
{
- if (ssl_debug_file)
- fflush(ssl_debug_file);
+ if (ssl_debug_file)
+ fflush(ssl_debug_file);
}
void
}
void
-ssl_print_text_data(const gchar* name, const guchar* data, gint len)
+ssl_print_text_data(const gchar* name, const guchar* data, size_t len)
{
- gint i;
+ size_t i;
if (!ssl_debug_file)
return;
fprintf(ssl_debug_file,"%s: ",name);
}
void
-ssl_print_data(const gchar* name, const guchar* data, gint len)
+ssl_print_data(const gchar* name, const guchar* data, size_t len)
{
- gint i;
+ size_t i;
if (!ssl_debug_file)
return;
- fprintf(ssl_debug_file,"%s[%d]:\n",name, len);
+ fprintf(ssl_debug_file,"%s[%d]:\n",name, (int) len);
for (i=0; i< len; i++) {
if ((i>0) && (i%16 == 0))
fprintf(ssl_debug_file,"\n");
ssl_print_data(name, data->data, data->data_len);
}
#endif /* SSL_DECRYPT_DEBUG */
+
+/* checks for SSL and DTLS UAT key list fields */
+
+gboolean
+ssldecrypt_uat_fld_ip_chk_cb(void* r _U_, const char* p, unsigned len _U_, const void* u1 _U_, const void* u2 _U_, const char** err)
+{
+
+ if ((gint)strlen(p) == 0) {
+ *err = ep_strdup_printf("No IP address given.");
+ return FALSE;
+ }
+
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean
+ssldecrypt_uat_fld_port_chk_cb(void* r _U_, const char* p, unsigned len _U_, const void* u1 _U_, const void* u2 _U_, const char** err)
+{
+ guint i;
+
+ if ((gint)strlen(p) == 0) {
+ *err = ep_strdup_printf("No Port given.");
+ return FALSE;
+ }
+
+ if (strcmp(p, "start_tls") != 0){
+ i = atoi(p);
+ if (i <= 0) {
+ *err = ep_strdup_printf("Invalid port given.");
+ return FALSE;
+ }
+ }
+
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean
+ssldecrypt_uat_fld_protocol_chk_cb(void* r _U_, const char* p, unsigned len _U_, const void* u1 _U_, const void* u2 _U_, const char** err)
+{
+ if ((gint)strlen(p) == 0) {
+ *err = ep_strdup_printf("No protocol given.");
+ return FALSE;
+ }
+
+ if (!find_dissector(p)) {
+ *err = ep_strdup_printf("Could not find dissector for: '%s'", p);
+ return FALSE;
+ }
+
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean
+ssldecrypt_uat_fld_fileopen_chk_cb(void* r _U_, const char* p, unsigned len _U_, const void* u1 _U_, const void* u2 _U_, const char** err)
+{
+ ws_statb64 st;
+
+ if ((gint)strlen(p) == 0) {
+ *err = ep_strdup_printf("No filename given.");
+ return FALSE;
+ } else {
+ if (ws_stat64(p, &st) != 0) {
+ *err = ep_strdup_printf("File '%s' does not exist or access is denied.", p);
+ return FALSE;
+ }
+ }
+
+ *err = NULL;
+ return TRUE;
+}
+
+gboolean
+ssldecrypt_uat_fld_password_chk_cb(void* r _U_, const char* p, unsigned len _U_, const void* u1 _U_, const void* u2 _U_, const char** err)
+{
+ ssldecrypt_assoc_t* f = r;
+ FILE *fp = NULL;
+
+ if ((gint)strlen(p) > 0) {
+ fp = ws_fopen(f->keyfile, "rb");
+ if (fp) {
+ if (!ssl_load_pkcs12(fp, p)) {
+ fclose(fp);
+ *err = ep_strdup_printf("Invalid. Password is necessary only if you use PKCS#12 key file.");
+ return FALSE;
+ }
+ fclose(fp);
+ } else {
+ *err = ep_strdup_printf("Leave this field blank if the keyfile is not PKCS#12.");
+ return FALSE;
+ }
+ }
+
+ *err = NULL;
+ return TRUE;
+}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */