summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2013-01-23 20:53:58 +0000
committerwtc%google.com <devnull@localhost>2013-01-23 20:53:58 +0000
commit795b761c52db66248acf25c8be08270e1f7f021c (patch)
tree156b4e6914dd82f920040b0ea086e2384970c0f3
parent08416a6e614063c8276fdf0ddd6195e2adcda16b (diff)
downloadnss-hg-795b761c52db66248acf25c8be08270e1f7f021c.tar.gz
Bug 833052: Add three more SHA256 cipher suites to ssltap. r=emaldona.
-rw-r--r--security/nss/cmd/ssltap/ssltap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/nss/cmd/ssltap/ssltap.c b/security/nss/cmd/ssltap/ssltap.c
index b27e91488..7d7f1e5fa 100644
--- a/security/nss/cmd/ssltap/ssltap.c
+++ b/security/nss/cmd/ssltap/ssltap.c
@@ -333,8 +333,11 @@ const char * V2CipherString(int cs_int)
case 0x000039: cs_str = "TLS/DHE-RSA/AES256-CBC/SHA"; break;
case 0x00003A: cs_str = "TLS/DH-ANON/AES256-CBC/SHA"; break;
+ case 0x00003B: cs_str = "TLS/RSA/NULL/SHA256"; break;
case 0x00003C: cs_str = "TLS/RSA/AES128-CBC/SHA256"; break;
case 0x00003D: cs_str = "TLS/RSA/AES256-CBC/SHA256"; break;
+ case 0x00003E: cs_str = "TLS/DH-DSS/AES128-CBC/SHA256"; break;
+ case 0x00003F: cs_str = "TLS/DH-RSA/AES128-CBC/SHA256"; break;
case 0x000040: cs_str = "TLS/DHE-DSS/AES128-CBC/SHA256"; break;
case 0x000041: cs_str = "TLS/RSA/CAMELLIA128-CBC/SHA"; break;