diff options
| author | Mališa Vučinić <malishav@gmail.com> | 2020-05-14 08:33:40 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-05-27 06:59:47 +0000 |
| commit | 5aaec7f16dca14d2184edbd9a7dc53df11b379cc (patch) | |
| tree | ef056df28e0a8268581478c9c189544128c8b42d /epan/dissectors/packet-oscore.h | |
| parent | 53a24787b8552bd30674718e2e048a870331e47c (diff) | |
oscore: Update to RFC8613.
-Update dissection of the OSCORE option.
-Enable zero-length Sender and Recipient ID.
-Add ID Context field in preferences.
-Update context derivation to rfc8613.
-Extend context lookup to include ID context.
-Fix Observe responses.
Bug: 16585
Change-Id: Ib9823a54cf535be3559e1c41a19b8b612458777f
Reviewed-on: https://code.wireshark.org/review/37314
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-oscore.h')
| -rw-r--r-- | epan/dissectors/packet-oscore.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-oscore.h b/epan/dissectors/packet-oscore.h index 3e6fd6608a..59b1ff6639 100644 --- a/epan/dissectors/packet-oscore.h +++ b/epan/dissectors/packet-oscore.h @@ -31,12 +31,14 @@ typedef struct oscore_context { /* Pre-Shared Parameters as Strings */ gchar *master_secret_prefs; gchar *master_salt_prefs; + gchar *id_context_prefs; gchar *sender_id_prefs; gchar *recipient_id_prefs; cose_aead_alg_t algorithm; /* Pre-Shared Parameters as Byte Arrays */ GByteArray *master_secret; GByteArray *master_salt; + GByteArray *id_context; GByteArray *sender_id; GByteArray *recipient_id; /* Derived Parameters */ @@ -53,7 +55,8 @@ typedef struct oscore_info { guint8 kid_context_len; guint8 *piv; guint8 piv_len; - gboolean piv_in_response; + guint8 *request_piv; + guint8 request_piv_len; gboolean response; } oscore_info_t; |