dearsky/pico-hsm
1
0
Fork 0
Code Issues 17 Pull Requests 4 Actions Packages Projects Releases 26 Wiki Activity

Upgrade to mbedtls v3.3.0

Browse Source
This commit is contained in:
Pol Henarejos
2023-02-16 23:33:13 +01:00
parent 9be176e523
commit 7b62ca5327
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hsm/cmd_cipher_sym.c
View File

@@ -382,7 +382,6 @@ int cmd_cipher_sym() {
params = params =
{ .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) }; { .p = enc, .len = enc_len, .tag = (MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE) };
mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1; mbedtls_md_type_t md_type = MBEDTLS_MD_SHA1;
mbedtls_md_context_t md_ctx;
int r = pkcs5_parse_pbkdf2_params(&params, &salt, &iterations, &keylen, &md_type); int r = pkcs5_parse_pbkdf2_params(&params, &salt, &iterations, &keylen, &md_type);
if (r != 0) { if (r != 0) {
@@ -390,13 +389,7 @@ int cmd_cipher_sym() {
return SW_WRONG_DATA(); return SW_WRONG_DATA();
} }
mbedtls_md_init(&md_ctx); r = mbedtls_pkcs5_pbkdf2_hmac_ext(md_type,
if (mbedtls_md_setup(&md_ctx, mbedtls_md_info_from_type(md_type), 1) != 0) {
mbedtls_md_free(&md_ctx);
mbedtls_platform_zeroize(kdata, sizeof(kdata));
return SW_WRONG_DATA();
}
r = mbedtls_pkcs5_pbkdf2_hmac(&md_ctx,
kdata, kdata,
key_size, key_size,
salt.p, salt.p,
@@ -406,7 +399,6 @@ int cmd_cipher_sym() {
apdu.ne < 65536 ? apdu.ne : 32), apdu.ne < 65536 ? apdu.ne : 32),
res_APDU); res_APDU);
mbedtls_platform_zeroize(kdata, sizeof(kdata)); mbedtls_platform_zeroize(kdata, sizeof(kdata));
mbedtls_md_free(&md_ctx);
if (r != 0) { if (r != 0) {
return SW_EXEC_ERROR(); return SW_EXEC_ERROR();
} }