osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

smb2: Fix compilation with older gcrypt versions 

Change-Id: I803eabc2950c7a8083b20b929d0f02d3adbfc0db
Reviewed-on: https://code.wireshark.org/review/33829
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Joakim Karlsson 2019-07-04 23:30:11 +02:00 committed by Dario Lombardo
parent d560f76401
commit 13b018f90f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-smb2.c
View File

@ -9273,6 +9273,7 @@ static smb2_function smb2_dissector[256] = {
#define SMB3_AES128CCM_NONCE 11
#define SMB3_AES128GCM_NONCE 12
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
static guint8*
decrypt_smb_payload(packet_info *pinfo,
tvbuff_t *tvb, int offset,
@ -9331,13 +9332,8 @@ decrypt_smb_payload(packet_info *pinfo,
switch (sti->conv->enc_alg) {
case SMB2_CIPHER_AES_128_CCM:
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
mode = GCRY_CIPHER_MODE_CCM;
iv_size = SMB3_AES128CCM_NONCE;
#else
/* g_warning("GCRY: CCM decryption requires gcrypt >= 1.6.0"); */
return NULL;
#endif
break;
case SMB2_CIPHER_AES_128_GCM:
mode = GCRY_CIPHER_MODE_GCM;
@ -9373,7 +9369,6 @@ decrypt_smb_payload(packet_info *pinfo,
lengths[1] = aad_size; /* AAD length */
lengths[2] = 16; /* tag length (signature size) */
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
if (mode == GCRY_CIPHER_MODE_CCM) {
if ((err = gcry_cipher_ctl(cipher_hd, GCRYCTL_SET_CCM_LENGTHS, lengths, sizeof(lengths)))) {
/* g_warning("GCRY: ctl %s/%s\n", gcry_strsource(err), gcry_strerror(err)); */
@ -9381,7 +9376,6 @@ decrypt_smb_payload(packet_info *pinfo,
return NULL;
}
}
#endif
if ((err = gcry_cipher_authenticate(cipher_hd, aad, aad_size))) {
/* g_warning("GCRY: auth %s/%s\n", gcry_strsource(err), gcry_strerror(err)); */
@ -9401,6 +9395,7 @@ decrypt_smb_payload(packet_info *pinfo,
gcry_cipher_close(cipher_hd);
return data;
}
#endif
static int
dissect_smb2_transform_header(packet_info *pinfo, proto_tree *tree,
@ -9453,7 +9448,11 @@ dissect_smb2_transform_header(packet_info *pinfo, proto_tree *tree,
sti->session = smb2_get_session(sti->conv, sti->sesid, NULL, NULL);
smb2_add_session_info(sesid_tree, tvb, sesid_offset, sti->session);
#if GCRYPT_VERSION_NUMBER >= 0x010600 /* 1.6.0 */
plain_data = decrypt_smb_payload(pinfo, tvb, offset, offset_aad, sti);
#else
(void) offset_aad;
#endif
*enc_tvb = tvb_new_subset_length(tvb, offset, sti->size);
if (plain_data != NULL) {