Wireshark-commits: [Wireshark-commits] master df639f5: Fixed bug in ZigBee (zbee) decryption, added
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 17 Dec 2014 11:53:30 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=df639f509e812fff3c5eb4bdf4f77988c6ec122b
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

df639f5 by Chris Brandson (chris.brandson@xxxxxxxxx):

    Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector.
    
    Removed attrID and cmdID ZCL cluster functions.
    Bug in ZCL HVAC attribute registration.
    Fixed bug in ZCL command ID field registration.
    Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014
    Fixed broken fragmented ZigBee packet collection and reassembly
    Use protocol fields for Thermostat schedule transitions.
    Added support for Key Establishment Cluster (CBKE) at SE 1.2a
    Updated Message cluster to SE 1.2a spec
    Added attribute reporting status which is common to all SE 1.2a clusters
    Added SE 1.2a tunnel cluster support
    ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences
    The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance
    ZigBee security added key display for decrypted packets
    ZigBee Security Preferences fixed UAT type for Label so key label is editable again
    Added definition for Retail Service profile
    Added dissection for profile-wide (General Command Frame) commands when the profile is unknown
    Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files
    
    Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad
    Reviewed-on: https://code.wireshark.org/review/5565
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  c5b7207   Install cmake files to make them available for out of source builds
    adds  df639f5   Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector.


Summary of changes:
 epan/CMakeLists.txt                            |    1 +
 epan/dissectors/Makefile.common                |    1 +
 epan/dissectors/packet-zbee-aps.c              |  202 +--
 epan/dissectors/packet-zbee-aps.h              |   11 +-
 epan/dissectors/packet-zbee-nwk.c              |   20 +-
 epan/dissectors/packet-zbee-security.c         |   91 +-
 epan/dissectors/packet-zbee-zcl-general.c      |  752 +++++------
 epan/dissectors/packet-zbee-zcl-ha.c           |  174 +--
 epan/dissectors/packet-zbee-zcl-meas-sensing.c |  122 +-
 epan/dissectors/packet-zbee-zcl-misc.c         | 1115 +++++++++++++++
 epan/dissectors/packet-zbee-zcl-se.c           | 1726 +++++++++++++++++++++++-
 epan/dissectors/packet-zbee-zcl.c              | 1360 ++++++-------------
 epan/dissectors/packet-zbee-zcl.h              |   13 +-
 epan/dissectors/packet-zbee.h                  | 1109 +++++++++------
 epan/tfs.c                                     |    3 +-
 epan/tfs.h                                     |    5 +-
 tools/checkfiltername.pl                       |    2 +
 17 files changed, 4471 insertions(+), 2236 deletions(-)
 create mode 100644 epan/dissectors/packet-zbee-zcl-misc.c