diff options
| author | Mališa Vučinić <malishav@gmail.com> | 2017-12-26 16:35:55 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-30 07:37:24 +0000 |
| commit | cdcf9d0817f8e789d667ef41730d59f0723d39e6 (patch) | |
| tree | dcf65fe4a1e444317489b3cebf704d2340261732 /epan/dissectors/packet-ieee802154.h | |
| parent | 7207c82464a225a1d167c397dcef1232b0224467 (diff) | |
ieee802154: Allow generic nonce to be passed in CCM* API.
CCM* algorithm implemented as part of ieee802154 dissector can be
leveraged for higher layer protocols, e.g. OSCORE. This change adds an
additional parameter to the CCM* API in order to allow passing a generic
13-byte nonce.
Bug: 14367
Change-Id: Ib2da1146659f67ffb3a4767ec093f8b7f09461ce
Reviewed-on: https://code.wireshark.org/review/25455
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.h')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index c7b5e665ed..24235d2477 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -481,7 +481,7 @@ void dissect_ieee802154_superframe (tvbuff_t *, packet_info *, proto_tree * void dissect_ieee802154_gtsinfo (tvbuff_t *, packet_info *, proto_tree *, guint *); void dissect_ieee802154_pendaddr (tvbuff_t *, packet_info *, proto_tree *, guint *); void dissect_ieee802154_aux_sec_header_and_key(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ieee802154_packet *packet, guint *offset); -void ccm_init_block(gchar *block, gboolean adata, gint M, guint64 addr, guint32 frame_counter, guint8 level, gint ctr_val); +void ccm_init_block(gchar *block, gboolean adata, gint M, guint64 addr, guint32 frame_counter, guint8 level, gint ctr_val, const gchar *generic_nonce); gboolean ccm_ctr_encrypt(const gchar *key, const gchar *iv, gchar *mic, gchar *data, gint length); gboolean ccm_cbc_mac(const gchar *key, const gchar *iv, const gchar *a, gint a_len, const gchar *m, gint m_len, gchar *mic); |