eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x509parse_crt() and x509parse_crt_der() return X509 password related codes

Browse source 
POLARSSL_ERR_X509_PASSWORD_MISMATCH is returned instead of
POLARSSL_ERR_PEM_PASSWORD_MISMATCH and
POLARSSL_ERR_X509_PASSWORD_REQUIRED instead of
POLARSSL_ERR_PEM_PASSWORD_REQUIRED

Rationale: For PKCS#8 encrypted keys the same are returned
(cherry picked from commit b495d3a2c7)
This commit is contained in:
Paul Bakker 2013-06-24 19:32:25 +02:00
parent 72823091c2
commit a4232a7ccb
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/x509parse.c
View file

@ -2329,6 +2329,10 @@ int x509parse_key( rsa_context *rsa, const unsigned char *key, size_t keylen,
pem_free( &pem );
return( ret );
}
else if( ret == POLARSSL_ERR_PEM_PASSWORD_MISMATCH )
return( POLARSSL_ERR_X509_PASSWORD_MISMATCH );
else if( ret == POLARSSL_ERR_PEM_PASSWORD_REQUIRED )
return( POLARSSL_ERR_X509_PASSWORD_REQUIRED );
else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
return( ret );