diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-03-28 13:21:20 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-28 14:03:48 +0000 |
| commit | 4adb8e9f6af7b5e4568f50a29ae9814b5e190088 (patch) | |
| tree | 8f8e119154110107e591ace3c66d10af9a3f8f6d | |
| parent | 00ce7a59aaae26acf03864a1f71f24be33c1c057 (diff) | |
Kerberos: do not store empty keys
Bug: 14576
Change-Id: Ib52133a1b43e237f76f17a38d308407c0431d33e
Reviewed-on: https://code.wireshark.org/review/26672
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/asn1/kerberos/kerberos.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/asn1/kerberos/kerberos.cnf b/epan/dissectors/asn1/kerberos/kerberos.cnf index 5edeb52519..79a1b3a4d2 100644 --- a/epan/dissectors/asn1/kerberos/kerberos.cnf +++ b/epan/dissectors/asn1/kerberos/kerberos.cnf @@ -339,7 +339,7 @@ guint32 msgtype; %(DEFAULT_BODY)s - if (private_data->key.keytype != 0) { + if (private_data->key.keytype != 0 && private_data->key.keylength > 0) { ##ifdef HAVE_KERBEROS add_encryption_key(actx->pinfo, private_data->key.keytype, private_data->key.keylength, private_data->key.keyvalue, "key"); ##endif diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 51628cf8fd..ea4c4f851b 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -2586,7 +2586,7 @@ dissect_kerberos_EncryptionKey(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int EncryptionKey_sequence, hf_index, ett_kerberos_EncryptionKey); - if (private_data->key.keytype != 0) { + if (private_data->key.keytype != 0 && private_data->key.keylength > 0) { #ifdef HAVE_KERBEROS add_encryption_key(actx->pinfo, private_data->key.keytype, private_data->key.keylength, private_data->key.keyvalue, "key"); #endif |