Merge pull request #3708 from ronald-cron-arm/feature/fix_return_code_1-2.16

Backport 2.16: Fix return code expression in pkparse
This commit is contained in:
Gilles Peskine 2020-09-22 18:52:03 +02:00 committed by GitHub
commit 506498eaa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -692,7 +692,7 @@ int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG; ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
if( ret == 0 && *p != end ) if( ret == 0 && *p != end )
ret = MBEDTLS_ERR_PK_INVALID_PUBKEY ret = MBEDTLS_ERR_PK_INVALID_PUBKEY +
MBEDTLS_ERR_ASN1_LENGTH_MISMATCH; MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
if( ret != 0 ) if( ret != 0 )