mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-11 18:40:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkparse: rename RSA key and pubkey parsing functions

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2024-01-23 08:35:11 +01:00
parent fb12d9204d
commit fd49a46a36
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/pkparse.c
View File

@ -764,9 +764,9 @@ static int pk_parse_key_rfc8410_der(mbedtls_pk_context *pk,
* publicExponent INTEGER -- e * publicExponent INTEGER -- e
* } * }
*/ */
static int pk_get_rsapubkey(unsigned char **p, static int mbedtls_rsa_pubkey_parse(mbedtls_rsa_context *rsa,
const unsigned char *end, unsigned char **p,
mbedtls_rsa_context *rsa) const unsigned char *end)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
size_t len; size_t len;
@ -911,7 +911,7 @@ int mbedtls_pk_parse_subpubkey(unsigned char **p, const unsigned char *end,
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
if (pk_alg == MBEDTLS_PK_RSA) { if (pk_alg == MBEDTLS_PK_RSA) {
ret = pk_get_rsapubkey(p, end, mbedtls_pk_rsa(*pk)); ret = mbedtls_rsa_pubkey_parse(mbedtls_pk_rsa(*pk), p, end);
} else } else
#endif /* MBEDTLS_RSA_C */ #endif /* MBEDTLS_RSA_C */
#if defined(MBEDTLS_PK_HAVE_ECC_KEYS) #if defined(MBEDTLS_PK_HAVE_ECC_KEYS)
@ -976,9 +976,9 @@ static int asn1_get_nonzero_mpi(unsigned char **p,
/* /*
* Parse a PKCS#1 encoded private RSA key * Parse a PKCS#1 encoded private RSA key
*/ */
static int pk_parse_key_pkcs1_der(mbedtls_rsa_context *rsa, static int mbedtls_rsa_key_parse(mbedtls_rsa_context *rsa,
const unsigned char *key, const unsigned char *key,
size_t keylen) size_t keylen)
{ {
int ret, version; int ret, version;
size_t len; size_t len;
@ -1348,7 +1348,7 @@ static int pk_parse_key_pkcs8_unencrypted_der(
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
if (pk_alg == MBEDTLS_PK_RSA) { if (pk_alg == MBEDTLS_PK_RSA) {
if ((ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk), p, len)) != 0) { if ((ret = mbedtls_rsa_key_parse(mbedtls_pk_rsa(*pk), p, len)) != 0) {
mbedtls_pk_free(pk); mbedtls_pk_free(pk);
return ret; return ret;
} }
@ -1538,8 +1538,8 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
if (ret == 0) { if (ret == 0) {
pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA); pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 || if ((ret = mbedtls_pk_setup(pk, pk_info)) != 0 ||
(ret = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk), (ret = mbedtls_rsa_key_parse(mbedtls_pk_rsa(*pk),
pem.buf, pem.buflen)) != 0) { pem.buf, pem.buflen)) != 0) {
mbedtls_pk_free(pk); mbedtls_pk_free(pk);
} }
@ -1679,7 +1679,7 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA); pk_info = mbedtls_pk_info_from_type(MBEDTLS_PK_RSA);
if (mbedtls_pk_setup(pk, pk_info) == 0 && if (mbedtls_pk_setup(pk, pk_info) == 0 &&
pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk), key, keylen) == 0) { mbedtls_rsa_key_parse(mbedtls_pk_rsa(*pk), key, keylen) == 0) {
return 0; return 0;
} }
@ -1754,7 +1754,7 @@ int mbedtls_pk_parse_public_key(mbedtls_pk_context *ctx,
return ret; return ret;
} }
if ((ret = pk_get_rsapubkey(&p, p + pem.buflen, mbedtls_pk_rsa(*ctx))) != 0) { if ((ret = mbedtls_rsa_pubkey_parse(mbedtls_pk_rsa(*ctx), &p, p + pem.buflen)) != 0) {
mbedtls_pk_free(ctx); mbedtls_pk_free(ctx);
} }
@ -1801,7 +1801,7 @@ int mbedtls_pk_parse_public_key(mbedtls_pk_context *ctx,
} }
p = (unsigned char *) key; p = (unsigned char *) key;
ret = pk_get_rsapubkey(&p, p + keylen, mbedtls_pk_rsa(*ctx)); ret = mbedtls_rsa_pubkey_parse(mbedtls_pk_rsa(*ctx), &p, p + keylen);
if (ret == 0) { if (ret == 0) {
return ret; return ret;
} }