mirror of
https://github.com/espressif/mbedtls.git
synced 2025-06-15 21:41:27 +08:00
Compile fixes
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
parent
bae79fa16e
commit
94210b13eb
@ -1229,11 +1229,14 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
|||||||
const unsigned char *pwd, size_t pwdlen)
|
const unsigned char *pwd, size_t pwdlen)
|
||||||
{
|
{
|
||||||
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
||||||
|
const mbedtls_pk_info_t *pk_info;
|
||||||
#if defined(MBEDTLS_PEM_PARSE_C)
|
#if defined(MBEDTLS_PEM_PARSE_C)
|
||||||
size_t len;
|
size_t len;
|
||||||
mbedtls_pem_context pem;
|
mbedtls_pem_context pem;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
(void) pk_info;
|
||||||
|
|
||||||
PK_VALIDATE_RET(pk != NULL);
|
PK_VALIDATE_RET(pk != NULL);
|
||||||
if (keylen == 0) {
|
if (keylen == 0) {
|
||||||
return MBEDTLS_ERR_PK_KEY_INVALID_FORMAT;
|
return MBEDTLS_ERR_PK_KEY_INVALID_FORMAT;
|
||||||
@ -1255,7 +1258,6 @@ int mbedtls_pk_parse_key(mbedtls_pk_context *pk,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
const mbedtls_pk_info_t *pk_info;
|
|
||||||
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 = pk_parse_key_pkcs1_der(mbedtls_pk_rsa(*pk),
|
||||||
|
@ -175,11 +175,13 @@ exit:
|
|||||||
int mbedtls_pk_write_pubkey(unsigned char **p, unsigned char *start,
|
int mbedtls_pk_write_pubkey(unsigned char **p, unsigned char *start,
|
||||||
const mbedtls_pk_context *key)
|
const mbedtls_pk_context *key)
|
||||||
{
|
{
|
||||||
|
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
|
||||||
size_t len = 0;
|
size_t len = 0;
|
||||||
|
|
||||||
(void) p;
|
(void) p;
|
||||||
(void) start;
|
(void) start;
|
||||||
(void) key;
|
(void) key;
|
||||||
|
(void) ret;
|
||||||
|
|
||||||
PK_VALIDATE_RET(p != NULL);
|
PK_VALIDATE_RET(p != NULL);
|
||||||
PK_VALIDATE_RET(*p != NULL);
|
PK_VALIDATE_RET(*p != NULL);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user