aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-10-26 16:04:21 +0000
committerEvan Huus <eapache@gmail.com>2013-10-26 16:04:21 +0000
commit3342e3bc891bbcc0416289802a12a08726cd6cd7 (patch)
treeeead114ce94c2d06f2a90d84301b82222cf2bace
parentdf5a9be3db7ca761f07757f3bd14d193217e6849 (diff)
Convert some emem to wmem. It took some manual flow analysis, but they are only
used during actual packet dissection. svn path=/trunk/; revision=52870
-rw-r--r--asn1/snmp/packet-snmp-template.c4
-rw-r--r--epan/dissectors/packet-snmp.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 5e7456ed4f..a07157dfe6 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -1479,7 +1479,7 @@ snmp_usm_auth_md5(snmp_usm_params_t* p, guint8** calc_auth_p, guint* calc_auth_l
msg[i] = '\0';
}
- calc_auth = (guint8*)ep_alloc(16);
+ calc_auth = (guint8*)wmem_alloc(wmem_packet_scope(), 16);
md5_hmac(msg, msg_len, key, key_len, calc_auth);
@@ -1543,7 +1543,7 @@ snmp_usm_auth_sha1(snmp_usm_params_t* p _U_, guint8** calc_auth_p, guint* calc_a
msg[i] = '\0';
}
- calc_auth = (guint8*)ep_alloc(20);
+ calc_auth = (guint8*)wmem_alloc(wmem_packet_scope(), 20);
sha1_hmac(key, key_len, msg, msg_len, calc_auth);
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 4a59cbc024..7effb2010b 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -1581,7 +1581,7 @@ snmp_usm_auth_md5(snmp_usm_params_t* p, guint8** calc_auth_p, guint* calc_auth_l
msg[i] = '\0';
}
- calc_auth = (guint8*)ep_alloc(16);
+ calc_auth = (guint8*)wmem_alloc(wmem_packet_scope(), 16);
md5_hmac(msg, msg_len, key, key_len, calc_auth);
@@ -1645,7 +1645,7 @@ snmp_usm_auth_sha1(snmp_usm_params_t* p _U_, guint8** calc_auth_p, guint* calc_a
msg[i] = '\0';
}
- calc_auth = (guint8*)ep_alloc(20);
+ calc_auth = (guint8*)wmem_alloc(wmem_packet_scope(), 20);
sha1_hmac(key, key_len, msg, msg_len, calc_auth);