Remove rsa member from x509_cert structure

This commit is contained in:
Manuel Pégourié-Gonnard 2013-07-11 11:14:55 +02:00 committed by Paul Bakker
parent ff56da3a26
commit 991d0f5aca
2 changed files with 0 additions and 13 deletions

View file

@ -212,7 +212,6 @@ typedef struct _x509_cert
x509_time valid_to; /**< End time of certificate validity. */ x509_time valid_to; /**< End time of certificate validity. */
pk_context pk; /**< Container for the public key context. */ pk_context pk; /**< Container for the public key context. */
rsa_context rsa; /**< Container for the RSA context. Kept for compatibility while transitioning to generic PK */
x509_buf issuer_id; /**< Optional X.509 v2/v3 issuer unique identifier. */ x509_buf issuer_id; /**< Optional X.509 v2/v3 issuer unique identifier. */
x509_buf subject_id; /**< Optional X.509 v2/v3 subject unique identifier. */ x509_buf subject_id; /**< Optional X.509 v2/v3 subject unique identifier. */

View file

@ -1422,17 +1422,6 @@ static int x509parse_crt_der_core( x509_cert *crt, const unsigned char *buf,
return( ret ); return( ret );
} }
/*
* Temporary hack for compatibility while transitioning to PK abstraction
* (Cannot use rsa_wrap above since it would force RSA key type.)
*/
if( crt->pk.type == POLARSSL_PK_RSA ) {
memcpy( &crt->rsa, pk_rsa( crt->pk ), sizeof( rsa_context ) );
free( crt->pk.data );
crt->pk.data = &crt->rsa;
crt->pk.dont_free = 1;
}
/* /*
* issuerUniqueID [1] IMPLICIT UniqueIdentifier OPTIONAL, * issuerUniqueID [1] IMPLICIT UniqueIdentifier OPTIONAL,
* -- If present, version shall be v2 or v3 * -- If present, version shall be v2 or v3
@ -4011,7 +4000,6 @@ void x509_free( x509_cert *crt )
do do
{ {
pk_free( &cert_cur->pk ); pk_free( &cert_cur->pk );
rsa_free( &cert_cur->rsa );
name_cur = cert_cur->issuer.next; name_cur = cert_cur->issuer.next;
while( name_cur != NULL ) while( name_cur != NULL )