aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/kerberos/kerberos.cnf
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-10-08 23:58:18 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2014-10-09 21:45:18 +0000
commit112c90a04b778958985b02b9663743cea1039f47 (patch)
treefc5b95f0fdbc41ad064cf0dd95f3177dc892e6e4 /asn1/kerberos/kerberos.cnf
parent7690afbc54b8f30908cd63b5f6d06b1658bf5a01 (diff)
Kerberos: fix decryption of DCERPC with Kerberos encryption
Bug: 10538 Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c Reviewed-on: https://code.wireshark.org/review/4566 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1/kerberos/kerberos.cnf')
-rw-r--r--asn1/kerberos/kerberos.cnf9
1 files changed, 5 insertions, 4 deletions
diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf
index 4059cb9b89..edafd6032b 100644
--- a/asn1/kerberos/kerberos.cnf
+++ b/asn1/kerberos/kerberos.cnf
@@ -305,14 +305,15 @@ guint32 msgtype;
&gbl_keytype);
private_data->key.keytype = gbl_keytype;
-#.FN_BODY EncryptionKey/keyvalue
+#.FN_BODY EncryptionKey/keyvalue VAL_PTR=&out_tvb
+ tvbuff_t *out_tvb;
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);
- private_data->key.keylength = tvb_length_remaining(tvb, offset);
- private_data->key.keyvalue = tvb_get_ptr(tvb, offset, private_data->key.keylength);
-
%(DEFAULT_BODY)s
+ private_data->key.keylength = tvb_reported_length(out_tvb);
+ private_data->key.keyvalue = tvb_get_ptr(out_tvb, 0, private_data->key.keylength);
+
#.FN_BODY EncryptionKey
kerberos_private_data_t *private_data = kerberos_get_private_data(actx);