Merge pull request #4903 from kennethsoerensen/pkparse-warning_2.x

Backport 2.x: Remove compiler warning if only MBEDTLS_PK_PARSE_C is d…
This commit is contained in:
Gilles Peskine 2021-09-01 16:53:50 +02:00 committed by GitHub
commit 9be53ffd10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1380,8 +1380,11 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
} }
#endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */ #endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk, key, keylen ) ) == 0 ) ret = pk_parse_key_pkcs8_unencrypted_der( pk, key, keylen );
if( ret == 0 )
{
return( 0 ); return( 0 );
}
mbedtls_pk_free( pk ); mbedtls_pk_free( pk );
mbedtls_pk_init( pk ); mbedtls_pk_init( pk );