aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Bonnefoy-Claudet <bertrandbc@gmail.com>2016-02-27 11:09:28 +0100
committerMichael Mann <mmann78@netscape.net>2016-02-27 13:45:56 +0000
commitd4dd4fd8481a2059713619a3e0d28ced7edbdf31 (patch)
tree356155f67362b626f96b1ed9d19512b04245cefe
parent11b058e35ff878b5533424d89815b243b08fa725 (diff)
Fix names of SSLv2 RC2 cipher suites
The previous naming for suite 0x040080 was wrong according to [1] and [2]. It is an export suite but its name did not reflect that. This also removes the extra "CBC_" in both RC2 cipher suites as it seems more consistent with other names, the specification and OpenSSL. [1] https://github.com/openssl/openssl/blob/OpenSSL_1_0_2-stable/ssl/ssl2.h#L95 [2] http://www-archive.mozilla.org/projects/security/pki/nss/ssl/draft02.html Change-Id: I4a62463fdd7b0733a9652f8ab601848b26977c28 Reviewed-on: https://code.wireshark.org/review/14197 Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-ssl-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 6e07727dce..fd8fc06fbe 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -364,8 +364,8 @@ static 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" },
+ { 0x030080, "SSL2_RC2_128_CBC_WITH_MD5" },
+ { 0x040080, "SSL2_RC2_128_CBC_EXPORT40_WITH_MD5" },
{ 0x050080, "SSL2_IDEA_128_CBC_WITH_MD5" },
{ 0x060040, "SSL2_DES_64_CBC_WITH_MD5" },
{ 0x0700c0, "SSL2_DES_192_EDE3_CBC_WITH_MD5" },