summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas S. Dade <nic.dade@gmail.com>2015-11-25 23:24:52 -0800
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-11-26 11:05:16 +0000
commit44e5946ea523e15886c811ca7b320cce2c576704 (patch)
treefbc4ed8378b77ae30a570e183e668b026366fc71
parenta92137d46a00d9b3066ba8b59ce2eecd9bb77647 (diff)
downloadwireshark-44e5946ea523e15886c811ca7b320cce2c576704.tar.gz
L2TP: Correct L2TP over IP SHA1 message digest
It should match the MD5 code, and skip over the 0x00000000 session id at the start of tvb. Change-Id: Ia3bee2bd07015523acc49bd7cb0247c3f1ac986e Reviewed-on: https://code.wireshark.org/review/12168 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> (cherry picked from commit 97e627e56d98bc45cd87cf629617c0dbd1798f6b) Reviewed-on: https://code.wireshark.org/review/12176
-rw-r--r--epan/dissectors/packet-l2tp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index 292ae9591a..f398c74288 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -890,7 +890,7 @@ static void sha1_hmac_digest(l2tpv3_tunnel_t *tunnel,
}
}
- sha1_hmac_update(&ms, tvb_get_ptr(tvb, 0, idx + 1 - offset), idx + 1 - offset);
+ sha1_hmac_update(&ms, tvb_get_ptr(tvb, offset, idx + 1 - offset), idx + 1 - offset);
/* Message digest is calculated with an empty message digest field */
memset(zero, 0, SHA1_DIGEST_LEN);
sha1_hmac_update(&ms, zero, avp_len - 1);