Skip to content

Commit

Permalink
hotplace rev.331 ECDH-ES secret, AAD, COSE_KDF_Context
Browse files Browse the repository at this point in the history
  • Loading branch information
@princeb612
princeb612 committed Oct 16, 2023
1 parent 904758f commit eb7a777
Show file tree
Hide file tree
Showing 21 changed files with 1,131 additions and 662 deletions.
0 .github/workflows/cmake-single-platform.yml → .github/workflows/build.yml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# hotplace

* study of personal interests
* ![cmake workflow](https://github.com/princeb612/hotplace/actions/workflows/cmake-single-platform.yml/badge.svg)
* ![cmake workflow](https://github.com/princeb612/hotplace/actions/workflows/build.yml/badge.svg)
* ![codeql workflow](https://github.com/princeb612/hotplace/actions/workflows/codeql.yml/badge.svg)
* powered by
* ![openssl](https://img.shields.io/badge/openssl-1.1.1/3.0/3.1/3.2-green)
Expand Down
2 changes: 1 addition & 1 deletion sdk/base/basic/variant.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ return_t variant_copy(variant_t* target, const variant_t* source) {
variant_set_str_new((*target), source->data.str);
break;
default:
memcpy(&target->data, &source->data, RTL_FIELD_SIZE(variant_t, data));
throw;
break;
}
} else {
Expand Down
2 changes: 2 additions & 0 deletions sdk/base/basic/variant.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ typedef struct __variant_t {
} data;
uint32 size;
uint8 flag;

__variant_t() : type(TYPE_NULL), size(0), flag(0) { memset(&data, 0, sizeof(data)); }
} variant_t;

#define variant_init(vt) \
Expand Down
6 changes: 3 additions & 3 deletions sdk/crypto/basic/crypto_advisor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1379,17 +1379,17 @@ const hint_signature_t hint_signatures[] = {

const hint_cose_algorithm_t hint_cose_algorithms[] = {
{
cose_alg_t::cose_a128kw, // -3
cose_alg_t::cose_aes_128_kw, // -3
crypto_kty_t::kty_hmac,
cose_group_t::cose_group_aeskw,
},
{
cose_alg_t::cose_a192kw, // -4
cose_alg_t::cose_aes_192_kw, // -4
crypto_kty_t::kty_hmac,
cose_group_t::cose_group_aeskw,
},
{
cose_alg_t::cose_a256kw, // -5
cose_alg_t::cose_aes_256_kw, // -5
crypto_kty_t::kty_hmac,
cose_group_t::cose_group_aeskw,
},
Expand Down
68 changes: 50 additions & 18 deletions sdk/crypto/basic/openssl_hash.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ namespace hotplace {
namespace crypto {

enum openssl_hash_context_flag_t {
hmac = (1 << 0),
cmac = (1 << 1),
hash_hmac = (1 << 0),
hash_cmac = (1 << 1),
};

#define OPENSSL_HASH_CONTEXT_SIGNATURE 0x20090912
Expand Down Expand Up @@ -54,7 +54,6 @@ openssl_hash::~openssl_hash() {

return_t openssl_hash::open_byname(hash_context_t** handle, const char* algorithm, const unsigned char* key, unsigned keysize) {
return_t ret = errorcode_t::success;
hash_algorithm_t alg;
crypto_advisor* advisor = crypto_advisor::get_instance();

__try2 {
Expand All @@ -63,12 +62,18 @@ return_t openssl_hash::open_byname(hash_context_t** handle, const char* algorith
__leave2;
}

ret = advisor->find_evp_md(algorithm, alg);
if (errorcode_t::success != ret) {
__leave2;
hash_algorithm_t ha;
ret = advisor->find_evp_md(algorithm, ha);
if (errorcode_t::success == ret) {
ret = open(handle, ha, key, keysize);
} else {
crypt_algorithm_t ca;
crypt_mode_t cm;
ret = advisor->find_evp_cipher(algorithm, ca, cm);
if (errorcode_t::success == ret) {
ret = open(handle, ca, key, keysize);
}
}

ret = open(handle, alg, key, keysize);
}
__finally2 {
// do nothing
Expand Down Expand Up @@ -140,7 +145,7 @@ return_t openssl_hash::open(hash_context_t** handle, crypt_algorithm_t algorithm
context->_key.resize(key_size);
memcpy(&context->_key[0], key_data, key_size);

context->_flags |= openssl_hash_context_flag_t::cmac;
context->_flags |= openssl_hash_context_flag_t::hash_cmac;

cmac_context = CMAC_CTX_new();
if (nullptr == cmac_context) {
Expand Down Expand Up @@ -210,7 +215,7 @@ return_t openssl_hash::open(hash_context_t** handle, hash_algorithm_t algorithm,

EVP_DigestInit_ex(context->_md_context, context->_evp_md, nullptr);
} else {
context->_flags |= openssl_hash_context_flag_t::hmac;
context->_flags |= openssl_hash_context_flag_t::hash_hmac;

hmac_context = HMAC_CTX_new();
if (nullptr == hmac_context) {
Expand Down Expand Up @@ -295,9 +300,9 @@ return_t openssl_hash::init(hash_context_t* handle) {
__leave2;
}

if (context->_flags & openssl_hash_context_flag_t::cmac) {
if (context->_flags & openssl_hash_context_flag_t::hash_cmac) {
CMAC_Init(context->_cmac_context, &context->_key[0], context->_key.size(), context->_evp_cipher, nullptr);
} else if (context->_flags & openssl_hash_context_flag_t::hmac) {
} else if (context->_flags & openssl_hash_context_flag_t::hash_hmac) {
HMAC_Init_ex(context->_hmac_context, &context->_key[0], context->_key.size(), context->_evp_md, nullptr);
} else {
EVP_DigestInit_ex(context->_md_context, context->_evp_md, nullptr);
Expand Down Expand Up @@ -327,9 +332,9 @@ return_t openssl_hash::update(hash_context_t* handle, const byte_t* source_data,
__leave2;
}

if (context->_flags & openssl_hash_context_flag_t::cmac) {
if (context->_flags & openssl_hash_context_flag_t::hash_cmac) {
CMAC_Update(context->_cmac_context, source_data, source_size);
} else if (context->_flags & openssl_hash_context_flag_t::hmac) {
} else if (context->_flags & openssl_hash_context_flag_t::hash_hmac) {
HMAC_Update(context->_hmac_context, source_data, source_size);
} else {
EVP_DigestUpdate(context->_md_context, source_data, source_size);
Expand Down Expand Up @@ -390,7 +395,7 @@ return_t openssl_hash::finalize(hash_context_t* handle, binary_t& output) {
__leave2;
}

if (context->_flags & openssl_hash_context_flag_t::cmac) {
if (context->_flags & openssl_hash_context_flag_t::hash_cmac) {
crypto_advisor* advisor = crypto_advisor::get_instance();
const hint_blockcipher_t* hint = advisor->find_evp_cipher(context->_evp_cipher);
size_t size_digest = hint->_blocksize;
Expand All @@ -402,7 +407,7 @@ return_t openssl_hash::finalize(hash_context_t* handle, binary_t& output) {
unsigned int size_digest = EVP_MD_size(context->_evp_md);
output.resize(size_digest);

if (context->_flags & openssl_hash_context_flag_t::hmac) {
if (context->_flags & openssl_hash_context_flag_t::hash_hmac) {
HMAC_Final(context->_hmac_context, &output[0], &size_digest);
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
HMAC_CTX_reset(context->_hmac_context);
Expand Down Expand Up @@ -456,7 +461,7 @@ return_t openssl_hash::hash(hash_context_t* handle, const byte_t* source_data, s
__leave2;
}

if (context->_flags & openssl_hash_context_flag_t::cmac) {
if (context->_flags & openssl_hash_context_flag_t::hash_cmac) {
crypto_advisor* advisor = crypto_advisor::get_instance();
const hint_blockcipher_t* hint = advisor->find_evp_cipher(context->_evp_cipher);
unsigned int size_digest = hint->_blocksize;
Expand All @@ -474,7 +479,7 @@ return_t openssl_hash::hash(hash_context_t* handle, const byte_t* source_data, s
unsigned int size_digest = EVP_MD_size(context->_evp_md);
output.resize(size_digest);

if (context->_flags & openssl_hash_context_flag_t::hmac) {
if (context->_flags & openssl_hash_context_flag_t::hash_hmac) {
HMAC_Init_ex(context->_hmac_context, &context->_key[0], context->_key.size(), context->_evp_md, nullptr);
HMAC_Update(context->_hmac_context, source_data, source_size);
HMAC_Final(context->_hmac_context, &output[0], &size_digest);
Expand Down Expand Up @@ -508,5 +513,32 @@ return_t openssl_hash::hash(hash_context_t* handle, const byte_t* source_data, s

crypt_poweredby_t openssl_hash::get_type() { return crypt_poweredby_t::openssl; }

return_t hmac(binary_t& output, hash_algorithm_t alg, binary_t const& key, binary_t const& input) {
return_t ret = errorcode_t::success;
openssl_hash hash;
hash_context_t* handle = nullptr;

hash.open(&handle, alg, &key[0], key.size());
hash.init(handle);
hash.update(handle, &input[0], input.size());
hash.finalize(handle, output);
hash.close(handle);

return ret;
}

return_t cmac(binary_t& output, crypt_algorithm_t alg, binary_t const& key, binary_t const& input) {
return_t ret = errorcode_t::success;
openssl_hash hash;
hash_context_t* handle = nullptr;

hash.open(&handle, alg, &key[0], key.size());
hash.init(handle);
hash.update(handle, &input[0], input.size());
hash.finalize(handle, output);
hash.close(handle);
return ret;
}

} // namespace crypto
} // namespace hotplace
3 changes: 3 additions & 0 deletions sdk/crypto/basic/openssl_hash.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ class openssl_hash : public hash_t {
virtual crypt_poweredby_t get_type();
};

return_t hmac(binary_t& output, hash_algorithm_t alg, binary_t const& key, binary_t const& input);
return_t cmac(binary_t& output, crypt_algorithm_t alg, binary_t const& key, binary_t const& input);

} // namespace crypto
} // namespace hotplace

Expand Down
Loading

0 comments on commit eb7a777

Please sign in to comment.