Skip to content

Commit f602c72

Browse files
rluboscarlescufi
rlubos
authored and
carlescufi
committed
modules: uoscore-uedhoc: Update to the latest version
Update uoscore-uedhoc repository to the latest revision. Align uoscore tests with the API changes. Signed-off-by: Robert Lubos <[email protected]>
1 parent 029e750 commit f602c72

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

‎modules/uoscore-uedhoc/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@ if (CONFIG_UOSCORE OR CONFIG_UEDHOC)
4343
${UOSCORE_UEDHOC_SRC_DIR}/oscore/aad.c
4444
${UOSCORE_UEDHOC_SRC_DIR}/oscore/coap2oscore.c
4545
${UOSCORE_UEDHOC_SRC_DIR}/oscore/nonce.c
46+
${UOSCORE_UEDHOC_SRC_DIR}/oscore/nvm.c
4647
${UOSCORE_UEDHOC_SRC_DIR}/oscore/option.c
47-
${UOSCORE_UEDHOC_SRC_DIR}/oscore/oscore2coap.c
4848
${UOSCORE_UEDHOC_SRC_DIR}/oscore/oscore_coap.c
4949
${UOSCORE_UEDHOC_SRC_DIR}/oscore/oscore_cose.c
5050
${UOSCORE_UEDHOC_SRC_DIR}/oscore/oscore_hkdf_info.c
51+
${UOSCORE_UEDHOC_SRC_DIR}/oscore/oscore_interactions.c
52+
${UOSCORE_UEDHOC_SRC_DIR}/oscore/oscore2coap.c
53+
${UOSCORE_UEDHOC_SRC_DIR}/oscore/replay_protection.c
5154
${UOSCORE_UEDHOC_SRC_DIR}/oscore/security_context.c
5255
${UOSCORE_UEDHOC_SRC_DIR}/cbor/oscore_aad_array.c
5356
${UOSCORE_UEDHOC_SRC_DIR}/cbor/oscore_enc_structure.c
@@ -72,14 +75,15 @@ if (CONFIG_UOSCORE OR CONFIG_UEDHOC)
7275

7376
zephyr_library_sources(
7477
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/associated_data_encode.c
78+
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/bstr_encode_decode.c
7579
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/cert.c
7680
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/ciphertext.c
77-
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/c_x.c
7881
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/edhoc_cose.c
7982
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/edhoc_exporter.c
8083
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/edhoc_method_type.c
8184
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/hkdf_info.c
8285
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/initiator.c
86+
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/int_encode_decode.c
8387
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/okm.c
8488
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/plaintext_decode.c
8589
${UOSCORE_UEDHOC_SRC_DIR}/edhoc/plaintext_encode.c
@@ -93,6 +97,7 @@ if (CONFIG_UOSCORE OR CONFIG_UEDHOC)
9397
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_bstr_type.c
9498
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_cert.c
9599
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_id_cred_x.c
100+
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_int_type.c
96101
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_message_1.c
97102
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_message_2.c
98103
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_decode_message_3.c
@@ -109,8 +114,6 @@ if (CONFIG_UOSCORE OR CONFIG_UEDHOC)
109114
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_message_error.c
110115
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_sig_structure.c
111116
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_th2.c
112-
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_th3.c
113-
${UOSCORE_UEDHOC_SRC_DIR}/cbor/edhoc_encode_th4.c
114117
)
115118

116119
zephyr_library_link_libraries(mbedTLS)

‎tests/lib/uoscore/src/oscore_testvector_tests/oscore_tests.c

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ ZTEST(oscore_tests, oscore_client_test1)
2121
enum err r;
2222
struct context c_client;
2323
struct oscore_init_params params = {
24-
.dev_type = CLIENT,
2524
.master_secret.ptr = (uint8_t *)T1__MASTER_SECRET,
2625
.master_secret.len = T1__MASTER_SECRET_LEN,
2726
.sender_id.ptr = (uint8_t *)T1__SENDER_ID,
@@ -34,6 +33,7 @@ ZTEST(oscore_tests, oscore_client_test1)
3433
.id_context.len = T1__ID_CONTEXT_LEN,
3534
.aead_alg = OSCORE_AES_CCM_16_64_128,
3635
.hkdf = OSCORE_SHA_256,
36+
.fresh_master_secret_salt = true,
3737
};
3838

3939
r = oscore_context_init(&params, &c_client);
@@ -45,7 +45,7 @@ ZTEST(oscore_tests, oscore_client_test1)
4545
* during normal operation the sender sequence number is
4646
* increased automatically after every sending
4747
*/
48-
c_client.sc.sender_seq_num = 20;
48+
c_client.sc.ssn = 20;
4949

5050
uint8_t buf_oscore[256];
5151
uint32_t buf_oscore_len = sizeof(buf_oscore);
@@ -80,7 +80,6 @@ ZTEST(oscore_tests, oscore_client_test3)
8080
enum err r;
8181
struct context c_client;
8282
struct oscore_init_params params = {
83-
.dev_type = CLIENT,
8483
.master_secret.ptr = (uint8_t *)T3__MASTER_SECRET,
8584
.master_secret.len = T3__MASTER_SECRET_LEN,
8685
.sender_id.ptr = (uint8_t *)T3__SENDER_ID,
@@ -93,6 +92,7 @@ ZTEST(oscore_tests, oscore_client_test3)
9392
.id_context.len = T3__ID_CONTEXT_LEN,
9493
.aead_alg = OSCORE_AES_CCM_16_64_128,
9594
.hkdf = OSCORE_SHA_256,
95+
.fresh_master_secret_salt = true,
9696
};
9797

9898
r = oscore_context_init(&params, &c_client);
@@ -104,7 +104,7 @@ ZTEST(oscore_tests, oscore_client_test3)
104104
* during normal operation the sender sequence number is
105105
* increased automatically after every sending
106106
*/
107-
c_client.sc.sender_seq_num = 20;
107+
c_client.sc.ssn = 20;
108108

109109
uint8_t buf_oscore[256];
110110
uint32_t buf_oscore_len = sizeof(buf_oscore);
@@ -128,7 +128,6 @@ ZTEST(oscore_tests, oscore_client_test5)
128128
enum err r;
129129
struct context c_client;
130130
struct oscore_init_params params = {
131-
.dev_type = CLIENT,
132131
.master_secret.ptr = (uint8_t *)T5__MASTER_SECRET,
133132
.master_secret.len = T5__MASTER_SECRET_LEN,
134133
.sender_id.ptr = (uint8_t *)T5__SENDER_ID,
@@ -141,6 +140,7 @@ ZTEST(oscore_tests, oscore_client_test5)
141140
.id_context.len = T5__ID_CONTEXT_LEN,
142141
.aead_alg = OSCORE_AES_CCM_16_64_128,
143142
.hkdf = OSCORE_SHA_256,
143+
.fresh_master_secret_salt = true,
144144
};
145145

146146
r = oscore_context_init(&params, &c_client);
@@ -152,7 +152,7 @@ ZTEST(oscore_tests, oscore_client_test5)
152152
* during normal operation the sender sequence number is
153153
* increased automatically after every sending
154154
*/
155-
c_client.sc.sender_seq_num = 20;
155+
c_client.sc.ssn = 20;
156156

157157
uint8_t buf_oscore[256];
158158
uint32_t buf_oscore_len = sizeof(buf_oscore);
@@ -176,7 +176,6 @@ ZTEST(oscore_tests, oscore_server_test2)
176176
enum err r;
177177
struct context c_server;
178178
struct oscore_init_params params_server = {
179-
.dev_type = SERVER,
180179
.master_secret.ptr = (uint8_t *)T2__MASTER_SECRET,
181180
.master_secret.len = T2__MASTER_SECRET_LEN,
182181
.sender_id.ptr = (uint8_t *)T2__SENDER_ID,
@@ -189,6 +188,7 @@ ZTEST(oscore_tests, oscore_server_test2)
189188
.id_context.len = T2__ID_CONTEXT_LEN,
190189
.aead_alg = OSCORE_AES_CCM_16_64_128,
191190
.hkdf = OSCORE_SHA_256,
191+
.fresh_master_secret_salt = true,
192192
};
193193

194194
r = oscore_context_init(&params_server, &c_server);
@@ -198,13 +198,11 @@ ZTEST(oscore_tests, oscore_server_test2)
198198
/* Test decrypting of an incoming request */
199199
uint8_t buf_coap[256];
200200
uint32_t buf_coap_len = sizeof(buf_coap);
201-
bool oscore_present_flag = false;
202201

203202
r = oscore2coap((uint8_t *)T2__OSCORE_REQ, T2__OSCORE_REQ_LEN, buf_coap,
204-
&buf_coap_len, &oscore_present_flag, &c_server);
203+
&buf_coap_len, &c_server);
205204

206205
zassert_equal(r, ok, "Error in oscore2coap!");
207-
zassert_true(oscore_present_flag, "The packet is not OSCORE packet");
208206
zassert_mem_equal__(&buf_coap, T2__COAP_REQ, buf_coap_len,
209207
"oscore2coap failed");
210208

@@ -226,7 +224,6 @@ ZTEST(oscore_tests, oscore_server_test4)
226224
enum err r;
227225
struct context c_server;
228226
struct oscore_init_params params_server = {
229-
.dev_type = SERVER,
230227
.master_secret.ptr = (uint8_t *)T4__MASTER_SECRET,
231228
.master_secret.len = T4__MASTER_SECRET_LEN,
232229
.sender_id.ptr = (uint8_t *)T4__SENDER_ID,
@@ -239,6 +236,7 @@ ZTEST(oscore_tests, oscore_server_test4)
239236
.id_context.len = T4__ID_CONTEXT_LEN,
240237
.aead_alg = OSCORE_AES_CCM_16_64_128,
241238
.hkdf = OSCORE_SHA_256,
239+
.fresh_master_secret_salt = true,
242240
};
243241

244242
r = oscore_context_init(&params_server, &c_server);
@@ -267,7 +265,6 @@ ZTEST(oscore_tests, oscore_server_test6)
267265
enum err r;
268266
struct context c_server;
269267
struct oscore_init_params params_server = {
270-
.dev_type = SERVER,
271268
.master_secret.ptr = (uint8_t *)T6__MASTER_SECRET,
272269
.master_secret.len = T6__MASTER_SECRET_LEN,
273270
.sender_id.ptr = (uint8_t *)T6__SENDER_ID,
@@ -280,6 +277,7 @@ ZTEST(oscore_tests, oscore_server_test6)
280277
.id_context.len = T6__ID_CONTEXT_LEN,
281278
.aead_alg = OSCORE_AES_CCM_16_64_128,
282279
.hkdf = OSCORE_SHA_256,
280+
.fresh_master_secret_salt = true,
283281
};
284282

285283
r = oscore_context_init(&params_server, &c_server);
@@ -309,7 +307,6 @@ ZTEST(oscore_tests, oscore_misc_test8)
309307
enum err r;
310308
struct context c;
311309
struct oscore_init_params params = {
312-
.dev_type = SERVER,
313310
.master_secret.ptr = (uint8_t *)T7__MASTER_SECRET,
314311
.master_secret.len = T7__MASTER_SECRET_LEN,
315312
.sender_id.ptr = (uint8_t *)T7__SENDER_ID,
@@ -322,6 +319,7 @@ ZTEST(oscore_tests, oscore_misc_test8)
322319
.id_context.len = T7__ID_CONTEXT_LEN,
323320
.aead_alg = OSCORE_AES_CCM_16_64_128,
324321
.hkdf = OSCORE_SHA_256,
322+
.fresh_master_secret_salt = true,
325323
};
326324

327325
r = oscore_context_init(&params, &c);

‎west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ manifest:
346346
groups:
347347
- tee
348348
- name: uoscore-uedhoc
349-
revision: e8920192b66db4f909eb9cd3f155d5245c1ae825
349+
revision: 5fe2cb613bd7e4590bd1b00c2adf181ac0229379
350350
path: modules/lib/uoscore-uedhoc
351351
- name: zcbor
352352
revision: 67fd8bb88d3136738661fa8bb5f9989103f4599e

0 commit comments

Comments
 (0)