Created
October 1, 2013 17:01
-
-
Save Lekensteyn/6781709 to your computer and use it in GitHub Desktop.
ssl: Support PSK larger than 16 octets
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c | |
index e4e2ec4..31dbada 100644 | |
--- a/epan/dissectors/packet-ssl.c | |
+++ b/epan/dissectors/packet-ssl.c | |
@@ -2154,14 +2154,15 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, | |
size = (int)strlen(ssl_psk); | |
- /* psk must be 0 to 16 bytes*/ | |
- if (size < 0 || size > 32 || size % 2 != 0) | |
+ /* The length of PSK ranges from 0..2^16-1 octets (times two for hex string) */ | |
+ if (size < 0 || size % 2 != 0 || size >= (2 << 16)) | |
{ | |
+ ssl_debug_printf("dissect_ssl3_handshake: length of ssl.psk must be multiple of two"); | |
break; | |
} | |
/* convert hex string into char*/ | |
- out = (unsigned char*) wmem_alloc(wmem_packet_scope(), size > 0 ? size / 2 : 0); | |
+ out = (unsigned char*) wmem_alloc(wmem_packet_scope(), size / 2); | |
for (i = 0; i < size; i+=2) | |
{ | |
@@ -2172,7 +2173,7 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, | |
ssl->psk = (guchar*) out; | |
- psk_len = size > 0 ? size / 2 : 0; | |
+ psk_len = size / 2; | |
pre_master_len = psk_len * 2 + 4; | |
pre_master_secret.data = (guchar *)wmem_alloc(wmem_file_scope(), pre_master_len); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment