diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-06-24 06:01:11 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-06-24 06:01:11 +0000 |
| commit | 839680277328bf6b96d17971d483066fdfc41462 (patch) | |
| tree | d3a9cdf95a6222d62dbd2f9c45cf905b1c3ed5e6 /epan/dissectors/packet-ssl-utils.c | |
| parent | 5a7cd67ec7f916f3d9d13dc5101093caad852a27 (diff) | |
| download | wireshark-839680277328bf6b96d17971d483066fdfc41462.tar.gz | |
From "wiresharkbugzilla@jdkbx.cjb.net":
Support for RFC4279 Pre-Shared Key Ciphersuites for Transport Layer Security (TLS)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4853
svn path=/trunk/; revision=33309
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index f123e47e31..349ceab9d0 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1304,6 +1304,10 @@ static SslCipherSuite cipher_suites[]={ {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} }; |