aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--packet-ssl.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index fce8b22824..be0e890c0e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -199,6 +199,7 @@ Nathan Neulinger <nneul[AT]umr.edu> {
Automake and autoconf updates to handle the current CVS versions
of automake (which will probably eventually become the next
releases of automake and autoconf)
+ Additional cipher suite names for SSL
}
Tomislav Vujec <tvujec[AT]carnet.hr> {
diff --git a/packet-ssl.c b/packet-ssl.c
index 44a2714511..45b1efb886 100644
--- a/packet-ssl.c
+++ b/packet-ssl.c
@@ -2,7 +2,7 @@
* Routines for ssl dissection
* Copyright (c) 2000-2001, Scott Renfro <scott@renfro.org>
*
- * $Id: packet-ssl.c,v 1.16 2002/02/02 04:02:28 nneul Exp $
+ * $Id: packet-ssl.c,v 1.17 2002/02/07 18:56:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -221,6 +221,7 @@ static const value_string ssl_20_cipher_suites[] = {
{ 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" },
{ 0x000000, "TLS_NULL_WITH_NULL_NULL" },
{ 0x000001, "TLS_RSA_WITH_NULL_MD5" },
{ 0x000002, "TLS_RSA_WITH_NULL_SHA" },
@@ -252,6 +253,8 @@ static const value_string ssl_20_cipher_suites[] = {
{ 0x00001c, "SSL_FORTEZZA_KEA_WITH_NULL_SHA" },
{ 0x00001d, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA" },
{ 0x00001e, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA" },
+ { 0x000060, "TLS_RSA_EXPORT1024_WITH_RC4_56_MD5" },
+ { 0x000061, "TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5" },
{ 0x000062, "TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA" },
{ 0x000063, "TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA" },
{ 0x000064, "TLS_RSA_EXPORT1024_WITH_RC4_56_SHA" },