From d4d4b53422ad372c9c356699ac8370679e00fdd5 Mon Sep 17 00:00:00 2001 From: nedmsmith Date: Thu, 5 Dec 2024 08:29:26 -0800 Subject: [PATCH] intrep-key changes to follow convention Changed intrep-key to follow internal representation convention that uses text keys instead of numeric. --- cddl/examples/intrep-3.diag | 8 ++++---- cddl/intrep-key.cddl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cddl/examples/intrep-3.diag b/cddl/examples/intrep-3.diag index 1a2ee42a..ede28f45 100644 --- a/cddl/examples/intrep-3.diag +++ b/cddl/examples/intrep-3.diag @@ -17,12 +17,12 @@ ] ], / intrep-key / 65534 : [ / typed-crypto-key / { - / key / 0 : 556("base64_cert_path_X"), - / key-type / 1 : 1 + "key": 556("base64_cert_path_X"), + "key-type": 1 }, / typed-crypto-key / { - / key / 0 : 554("base64_key_Y"), - / key-type / 1 : 2 + "key": 554("base64_key_Y"), + "key-type": 2 } ] } diff --git a/cddl/intrep-key.cddl b/cddl/intrep-key.cddl index 4fd041a5..21f4c81c 100644 --- a/cddl/intrep-key.cddl +++ b/cddl/intrep-key.cddl @@ -3,8 +3,8 @@ $$measurement-values-map-extension //= ( ) typed-crypto-key = { - &(key: 0) => $crypto-key-type-choice - ? &(key-type: 1) => uint .bits key-type + key: $crypto-key-type-choice + ? key-type: uint .bits key-type } key-type = &(