Skip to content

Commit

Permalink
straggler files
Browse files Browse the repository at this point in the history
  • Loading branch information
Laurence Lundblade committed Nov 14, 2023
1 parent beeebd7 commit 0873d46
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions t_cose.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
E79383162AFC00FB00C2DF49 /* test_messages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = test_messages.c; path = data/test_messages.c; sourceTree = "<group>"; };
E79383172AFC00FB00C2DF49 /* test_messages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test_messages.h; path = data/test_messages.h; sourceTree = "<group>"; };
E793832D2B02A80B00C2DF49 /* aead_in_error.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = aead_in_error.diag; path = data/aead_in_error.diag; sourceTree = "<group>"; };
E793832E2B02A80B00C2DF49 /* cose_encrypt_p256_wrap_aescbc.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_p256_wrap_aescbc.diag; path = data/cose_encrypt_p256_wrap_aescbc.diag; sourceTree = "<group>"; };
E793832E2B02A80B00C2DF49 /* cose_encrypt_a128cbc_a128kw.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_a128cbc_a128kw.diag; path = data/cose_encrypt_a128cbc_a128kw.diag; sourceTree = "<group>"; };
E793832F2B02A80B00C2DF49 /* cose_encrypt_bad_iv.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_bad_iv.diag; path = data/cose_encrypt_bad_iv.diag; sourceTree = "<group>"; };
E79383302B02A80B00C2DF49 /* tstr_ciphertext.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tstr_ciphertext.diag; path = data/tstr_ciphertext.diag; sourceTree = "<group>"; };
E79383312B02A80B00C2DF49 /* cose_encrypt_wrong_rcpt_array.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_wrong_rcpt_array.diag; path = data/cose_encrypt_wrong_rcpt_array.diag; sourceTree = "<group>"; };
Expand All @@ -298,7 +298,7 @@
E79383342B02A80C00C2DF49 /* unknown_symmetric_alg.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = unknown_symmetric_alg.diag; path = data/unknown_symmetric_alg.diag; sourceTree = "<group>"; };
E79383352B02A80C00C2DF49 /* cose_encrypt_p256_wrap_128.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_p256_wrap_128.diag; path = data/cose_encrypt_p256_wrap_128.diag; sourceTree = "<group>"; };
E79383362B02A80C00C2DF49 /* hmac_error_header.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = hmac_error_header.diag; path = data/hmac_error_header.diag; sourceTree = "<group>"; };
E79383372B02A80C00C2DF49 /* cose_encrypt_p256_wrap_aesctr.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_p256_wrap_aesctr.diag; path = data/cose_encrypt_p256_wrap_aesctr.diag; sourceTree = "<group>"; };
E79383372B02A80C00C2DF49 /* cose_encrypt_a128ctr_a128kw.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_a128ctr_a128kw.diag; path = data/cose_encrypt_a128ctr_a128kw.diag; sourceTree = "<group>"; };
E79383382B02A80C00C2DF49 /* cose_recipients_map_instead_of_array.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_recipients_map_instead_of_array.diag; path = data/cose_recipients_map_instead_of_array.diag; sourceTree = "<group>"; };
E79383392B02A80D00C2DF49 /* cose_encrypt_wrong_array.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_wrong_array.diag; path = data/cose_encrypt_wrong_array.diag; sourceTree = "<group>"; };
E793833A2B02A80D00C2DF49 /* cose_encrypt_bad_alg.diag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cose_encrypt_bad_alg.diag; path = data/cose_encrypt_bad_alg.diag; sourceTree = "<group>"; };
Expand Down Expand Up @@ -584,8 +584,8 @@
E79383332B02A80C00C2DF49 /* cose_encrypt_crit.diag */,
E793833E2B02A80D00C2DF49 /* cose_encrypt_junk_recipient.diag */,
E79383352B02A80C00C2DF49 /* cose_encrypt_p256_wrap_128.diag */,
E793832E2B02A80B00C2DF49 /* cose_encrypt_p256_wrap_aescbc.diag */,
E79383372B02A80C00C2DF49 /* cose_encrypt_p256_wrap_aesctr.diag */,
E793832E2B02A80B00C2DF49 /* cose_encrypt_a128cbc_a128kw.diag */,
E79383372B02A80C00C2DF49 /* cose_encrypt_a128ctr_a128kw.diag */,
E79383392B02A80D00C2DF49 /* cose_encrypt_wrong_array.diag */,
E79383322B02A80B00C2DF49 /* cose_encrypt_wrong_extra.diag */,
E79383312B02A80B00C2DF49 /* cose_encrypt_wrong_rcpt_array.diag */,
Expand Down
10 changes: 5 additions & 5 deletions test/t_cose_encrypt_decrypt_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,11 @@ int32_t decrypt_known_good_aeskw_non_aead_test(void)
return INT32_MIN; /* Means no testing was actually done */
}

return_value = decrypt_key_wrap(UsefulBuf_FROM_BYTE_ARRAY_LITERAL(cose_encrypt_p256_wrap_aesctr));
return_value = decrypt_key_wrap(UsefulBuf_FROM_BYTE_ARRAY_LITERAL(cose_encrypt_a128ctr_a128kw));
if(return_value != 0) {
return return_value + 10000;
}
return_value = decrypt_key_wrap(UsefulBuf_FROM_BYTE_ARRAY_LITERAL(cose_encrypt_p256_wrap_aescbc));
return_value = decrypt_key_wrap(UsefulBuf_FROM_BYTE_ARRAY_LITERAL(cose_encrypt_a128cbc_a128kw));
if(return_value != 0) {
return return_value + 20000;
}
Expand Down Expand Up @@ -800,10 +800,10 @@ init_decrypt_test_list(struct decrypt_test tests[], int tests_count)
tests[test_num].expected_return_value = T_COSE_ERR_ENCRYPT_FORMAT;
NEXT_TEST;

tests[test_num].sz_description = "recipient array is a map";
tests[test_num].sz_description = "one recipient array is a map";
tests[test_num].message = UsefulBuf_FROM_BYTE_ARRAY_LITERAL(cose_encrypt_wrong_rcpt_array);
tests[test_num].cose_ec_curve_id = T_COSE_ELLIPTIC_CURVE_P_256;
tests[test_num].expected_return_value = T_COSE_ERR_ENCRYPT_FORMAT;
tests[test_num].expected_return_value = T_COSE_ERR_RECIPIENT_FORMAT;
NEXT_TEST;

tests[test_num].sz_description = "unknown crit header in cose_encrypt";
Expand Down Expand Up @@ -849,7 +849,7 @@ int32_t decrypt_known_bad(void)

for(i = 0; test_list[i].sz_description != NULL; i++) {
const struct decrypt_test *t = &test_list[i];
const char *test_to_break_on = "unknown recipient alg";
const char *test_to_break_on = "one recipient array is a map";
if(!strncmp(t->sz_description, test_to_break_on, strlen(test_to_break_on))){
/* For setting break point for a particular test */
result = 99;
Expand Down

0 comments on commit 0873d46

Please sign in to comment.