Skip to content

Commit

Permalink
hotplace rev.344 COSE decrypt
Browse files Browse the repository at this point in the history
  • Loading branch information
@princeb612
princeb612 committed Oct 20, 2023
1 parent c7ec282 commit 13e7a99
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 32 deletions.
8 changes: 4 additions & 4 deletions sdk/crypto/basic/crypto_advisor_hint_cose.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const hint_cose_algorithm_t hint_cose_algorithms[] = {
cose_group_t::cose_group_ecdhes_hkdf,
{
"sha256",
16,
32,
},
},
{
Expand All @@ -153,7 +153,7 @@ const hint_cose_algorithm_t hint_cose_algorithms[] = {
cose_group_t::cose_group_ecdhes_hkdf,
{
"sha512",
32,
64,
},
},
{
Expand All @@ -162,7 +162,7 @@ const hint_cose_algorithm_t hint_cose_algorithms[] = {
cose_group_t::cose_group_ecdhss_hkdf,
{
"sha256",
16,
32,
},
},
{
Expand All @@ -171,7 +171,7 @@ const hint_cose_algorithm_t hint_cose_algorithms[] = {
cose_group_t::cose_group_ecdhss_hkdf,
{
"sha512",
32,
64,
},
},
{
Expand Down
47 changes: 19 additions & 28 deletions sdk/crypto/cose/cbor_object_encryption.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,16 +482,24 @@ return_t cbor_object_encryption::decrypt(cose_context_t* handle, crypto_key* key
continue;
}

crypto_kty_t kty;
EVP_PKEY* epk = nullptr;

if (composer.exist(cose_key_t::cose_ephemeral_key, item.unprotected_map)) {
epk = item.epk;
} else if (composer.exist(cose_key_t::cose_static_key, item.unprotected_map)) {
epk = item.epk;
} else if (composer.exist(cose_key_t::cose_static_key_id, item.unprotected_map)) {
std::string static_keyid;
composer.finditem(cose_key_t::cose_static_key_id, static_keyid, item.unprotected_map);
epk = key->find(static_keyid.c_str(), alg_hint->kty);
switch (alg_hint->kty) {
case crypto_kty_t::kty_hmac:
key->get_privkey(pkey, kty, secret, true);
break;
case crypto_kty_t::kty_ec:
if (composer.exist(cose_key_t::cose_static_key_id, item.unprotected_map)) {
std::string static_keyid;
composer.finditem(cose_key_t::cose_static_key_id, static_keyid, item.unprotected_map);
epk = key->find(static_keyid.c_str(), alg_hint->kty);
} else {
epk = item.epk;
}
break;
default:
break;
}

cose_group_t group = alg_hint->group;
Expand All @@ -501,16 +509,12 @@ return_t cbor_object_encryption::decrypt(cose_context_t* handle, crypto_key* key
if (cose_group_t::cose_group_aeskw == group) {
} else if (cose_group_t::cose_group_direct == group) {
// RFC 8152 12.1. Direct Encryption
crypto_kty_t kty;
key->get_privkey(pkey, kty, cek, true);
cek = secret;
} else if (cose_group_t::cose_group_ecdsa == group) {
// RFC 8152 8.1. ECDSA
} else if (cose_group_t::cose_group_eddsa == group) {
// RFC 8152 8.2. Edwards-Curve Digital Signature Algorithms (EdDSAs)
} else if (cose_group_t::cose_group_hkdf_hmac == group) {
crypto_kty_t kty;
key->get_privkey(pkey, kty, secret, true);

// RFC 8152 12.1.2. Direct Key with KDF
compose_kdf_context(handle, &item, context);

Expand All @@ -520,8 +524,6 @@ return_t cbor_object_encryption::decrypt(cose_context_t* handle, crypto_key* key
// CEK solved
} else if (cose_group_t::cose_group_hkdf_aescmac == group) {
// RFC 8152 11.1. HMAC-Based Extract-and-Expand Key Derivation Function (HKDF)
crypto_kty_t kty;
key->get_privkey(pkey, kty, secret, true);

compose_kdf_context(handle, &item, context);

Expand All @@ -547,28 +549,17 @@ return_t cbor_object_encryption::decrypt(cose_context_t* handle, crypto_key* key
salt.resize(alg_hint->kdf.dlen);
kdf_hkdf(cek, alg_hint->kdf.dlen, secret, salt, context, alg_hint->kdf.algname);
// CEK solved
} else if (cose_group_t::cose_group_ecdhes_aeskw == group) {
} else if (cose_group_t::cose_group_ecdhes_aeskw == group || cose_group_t::cose_group_ecdhss_aeskw == group) {
// RFC 8152 12.5.1. ECDH
// RFC 8152 12.2.1. AES Key Wrap
dh_key_agreement(pkey, epk, secret);

compose_kdf_context(handle, &item, context);

// 12.5. Key Agreement with Key Wrap
crypt.open(&crypt_handle, alg_hint->param.algname, secret, kwiv);
crypt.decrypt(crypt_handle, item.bin_data, cek);
crypt.close(crypt_handle);
} else if (cose_group_t::cose_group_ecdhss_aeskw == group) {
// RFC 8152 12.5.1. ECDH
// RFC 8152 12.2.1. AES Key Wrap
compose_kdf_context(handle, &item, context);

dh_key_agreement(pkey, epk, secret);

// 12.5. Key Agreement with Key Wrap
salt.resize(alg_hint->kdf.dlen);
kdf_hkdf(kek, alg_hint->kdf.dlen, secret, salt, context, alg_hint->kdf.algname);

// 12.5. Key Agreement with Key Wrap
crypt.open(&crypt_handle, alg_hint->param.algname, kek, kwiv);
crypt.decrypt(crypt_handle, item.bin_data, cek);
crypt.close(crypt_handle);
Expand Down
6 changes: 6 additions & 0 deletions test/cose/sample.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1838,6 +1838,7 @@ void test_github_example() {
const char* pub_other;
const char* priv;
} unsent;
int debug;
} vector[] = {
// aes-ccm-examples
{
Expand Down Expand Up @@ -2318,6 +2319,8 @@ void test_github_example() {
"8367456E637279707443A1010140",
"B2353161740AACF1F7163647984B522A",
},
{},
1,
},
// ecdsa-examples
{
Expand Down Expand Up @@ -2993,6 +2996,9 @@ void test_github_example() {
if (vector[i].unsent.priv) {
cose.set(handle, cose_param_t::cose_shared_private, base16_decode(vector[i].unsent.priv));
}
if (vector[i].debug) {
int break_point_here = 1;
}

int tagvalue = iter->second;
binary_t decrypted;
Expand Down

0 comments on commit 13e7a99

Please sign in to comment.