git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de1b3c6
)
SSL/TLS: Add support of TLS Fallback Signaling Cipher Suite Value (SCSV) for Preventi...
author
Alexis La Goutte
<alexis.lagoutte@gmail.com>
Sun, 26 Apr 2015 17:17:34 +0000
(19:17 +0200)
committer
Anders Broman
<a.broman58@gmail.com>
Mon, 27 Apr 2015 04:51:38 +0000
(
04:51
+0000)
Update comment about TLS_FALLBACK_SCSV
Add new alert Inappropriate Fallback (86)
Change-Id: I17385b0a9ad71f3623ff4fdb4a9c588e46ba8d58
Reviewed-on: https://code.wireshark.org/review/8203
Reviewed-by: Anders Broman <a.broman58@gmail.com>
epan/dissectors/packet-ssl-utils.c
patch
|
blob
|
history
diff --git
a/epan/dissectors/packet-ssl-utils.c
b/epan/dissectors/packet-ssl-utils.c
index b2c71cc3b201ecc0a522423d8d0e1d0af8eefbb5..932dd40ba17ecfd74284279db5d200182f784a51 100644
(file)
--- a/
epan/dissectors/packet-ssl-utils.c
+++ b/
epan/dissectors/packet-ssl-utils.c
@@
-494,6
+494,7
@@
const value_string ssl_31_alert_description[] = {
{ 70, "Protocol Version" },
{ 71, "Insufficient Security" },
{ 80, "Internal Error" },
+ { 86, "Inappropriate Fallback" },
{ 90, "User Canceled" },
{ 100, "No Renegotiation" },
{ 110, "Unsupported Extension" },
@@
-784,7
+785,7
@@
static const value_string ssl_31_ciphersuite[] = {
/* 0x00,0xC6-FE Unassigned */
/* From RFC 5746 */
{ 0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" },
- /* From
draft-bmoeller-tls-downgrade-scsv-02
*/
+ /* From
RFC 7507
*/
{ 0x5600, "TLS_FALLBACK_SCSV" },
/* From RFC 4492 */
{ 0xc001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" },