Wireshark-commits: [Wireshark-commits] master 48630d4: packet-smb2: correctly dissect SMB2 TRANSFOR
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=48630d47422168c2a480bf4c0afe497d9a57d721
Submitter: "Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
48630d4 by Stefan Metzmacher (metze@xxxxxxxxx):
packet-smb2: correctly dissect SMB2 TRANSFORM_HEADER Flags
In the SMB 3.1.1 dialect, this field is interpreted as the Flags field, which indicates how the SMB2 message was transformed:
Encrypted 0x0001
- The message is encrypted using the cipher that was negotiated for this connection.
In the SMB 3.0 and SMB 3.0.2 dialects, this field is interpreted as the EncryptionAlgorithm field,
which contains the algorithm used for encrypting the SMB2 message. This field MUST be set to one of the following values:
SMB2_ENCRYPTION_AES128_CCM 0x0001
- The message is encrypted using the AES128 CCM algorithm.
For dissection it's enough to expect SMB 3.1.1, as the value and the meaning
of 0x0001 is always the same (as AES128 CCM was the only possible algorithm before 3.1.1)
Change-Id: I4bd796bd1be38ed4a6481aa7bf68cb5b2e3637d2
Signed-off-by: Stefan Metzmacher <metze@xxxxxxxxx>
Reviewed-on: https://code.wireshark.org/review/37785
Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Actions performed:
from 5b91801 value_string: Change the bytes_string struct to avoid Wpointer-sign
add 48630d4 packet-smb2: correctly dissect SMB2 TRANSFORM_HEADER Flags
Summary of changes:
epan/dissectors/packet-smb2.c | 36 ++++++++++++++++++++++++++++--------
epan/dissectors/packet-smb2.h | 2 +-
2 files changed, 29 insertions(+), 9 deletions(-)