mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-01 13:13:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

psa_util: minor code improvements

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2024-01-09 15:48:37 +01:00
parent 84890c9be2
commit 5713c8a5ac
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/psa_util.c
View File

@ -414,9 +414,7 @@ int mbedtls_ecdsa_raw_to_der(const unsigned char *raw, size_t raw_len,
/* Since raw and der buffers might overlap, dump r and s before starting
* the conversion. */
memset(r, 0, sizeof(r));
memcpy(r, raw, coordinate_len);
memset(s, 0, sizeof(s));
memcpy(s, raw + coordinate_len, coordinate_len);
/* der buffer will initially be written starting from its end so we pick s
@ -481,6 +479,10 @@ static int convert_der_to_raw_single_int(unsigned char *der, size_t der_len,
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
size_t unpadded_len, padding_len = 0;
if (raw_len < coordinate_size) {
return MBEDTLS_ERR_ASN1_BUF_TOO_SMALL;
}
/* Get the length of ASN.1 element (i.e. the integer we need to parse). */
ret = mbedtls_asn1_get_tag(&p, p + der_len, &unpadded_len,
MBEDTLS_ASN1_INTEGER);
@ -498,10 +500,6 @@ static int convert_der_to_raw_single_int(unsigned char *der, size_t der_len,
}
}
if (raw_len < coordinate_size) {
return ERR_ASN1_BUF_TOO_SMALL;
}
if (unpadded_len < coordinate_size) {
padding_len = coordinate_size - unpadded_len;
memset(raw, 0x00, padding_len);
@ -557,7 +555,7 @@ int mbedtls_ecdsa_der_to_raw(const unsigned char *der, size_t der_len,
data_len -= ret;
/* Check that we consumed all the input der data. */
if ((p - der) != (int) der_len) {
if ((size_t) (p - der) != der_len) {
return MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
}