aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorAlex Badea <abadea@ixiacom.com>2014-06-17 13:55:06 +0300
committerAnders Broman <a.broman58@gmail.com>2014-06-17 14:44:41 +0000
commitf9b05dc13213832dba10600bd0116505ed251fec (patch)
treedc6a796f2ffb896ad8e6ef6ae6765c4dd6e40dbc /epan
parentf847b92b0857b3503a6c652a8ddcd159bd774a85 (diff)
isakmp: allow IKEv1 decryption with non-PSK authentication
There is a check that disables decryption for non-PSK authentication. It has been around ever since its introduction in commit acfe071e (svn r17229). As suggested in bug 7951, remove this check to allow decryption for e.g. certificates authentication. Bug: 7951 Change-Id: I5e98407d0f8dbabac2cdaf632cf0af403192872b Signed-off-by: Alex Badea <abadea@ixiacom.com> Reviewed-on: https://code.wireshark.org/review/2297 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-isakmp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index cc19931778..e8475a3ec1 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -1751,7 +1751,6 @@ decrypt_payload(tvbuff_t *tvb, packet_info *pinfo, const guint8 *buf, guint buf_
guint32 message_id, cbc_block_size, digest_size;
if (!decr ||
- decr->is_psk == FALSE ||
decr->gi_len == 0 ||
decr->gr_len == 0)
return NULL;