mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-10 06:40:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of x509_cert.pkoid

Browse Source 
Unused, comment did not match reality, and will soon be superseeded by the
'type' field of the pk_context which will replace rsa_context.
This commit is contained in:
Manuel Pégourié-Gonnard 2013-07-09 11:26:17 +02:00 committed by Paul Bakker
parent 374e4b87d4
commit 788db112a5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/polarssl/x509.h
View File

@ -211,7 +211,6 @@ typedef struct _x509_cert
x509_time valid_from; /**< Start time of certificate validity. */
x509_time valid_to; /**< End time of certificate validity. */
x509_buf pk_oid; /**< Subject public key info. Includes the public key algorithm and the key itself. */
rsa_context rsa; /**< Container for the RSA context. Only RSA is supported for public keys at this time. */
x509_buf issuer_id; /**< Optional X.509 v2/v3 issuer unique identifier. */

11
library/x509parse.c
View File

@ -545,21 +545,21 @@ static int x509_get_dates( unsigned char **p,
*/
static int x509_get_pubkey( unsigned char **p,
const unsigned char *end,
x509_buf *pk_alg_oid,
mpi *N, mpi *E )
{
int ret;
size_t len;
x509_buf pk_alg_oid;
unsigned char *end2;
pk_type_t pk_alg = POLARSSL_PK_NONE;
if( ( ret = asn1_get_alg_null( p, end, pk_alg_oid ) ) != 0 )
if( ( ret = asn1_get_alg_null( p, end, &pk_alg_oid ) ) != 0 )
return( POLARSSL_ERR_X509_CERT_INVALID_PUBKEY + ret );
/*
* only RSA public keys handled at this time
*/
if( oid_get_pk_alg( pk_alg_oid, &pk_alg ) != 0 )
if( oid_get_pk_alg( &pk_alg_oid, &pk_alg ) != 0 )
{
return( POLARSSL_ERR_X509_UNKNOWN_PK_ALG );
}
@ -1377,7 +1377,7 @@ static int x509parse_crt_der_core( x509_cert *crt, const unsigned char *buf,
return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
}
if( ( ret = x509_get_pubkey( &p, p + len, &crt->pk_oid,
if( ( ret = x509_get_pubkey( &p, p + len,
&crt->rsa.N, &crt->rsa.E ) ) != 0 )
{
x509_free( crt );
@ -2585,7 +2585,6 @@ int x509parse_public_key_rsa( rsa_context *rsa,
int ret;
size_t len;
unsigned char *p, *end;
x509_buf alg_oid;
#if defined(POLARSSL_PEM_C)
pem_context pem;
@ -2641,7 +2640,7 @@ int x509parse_public_key_rsa( rsa_context *rsa,
return( POLARSSL_ERR_X509_CERT_INVALID_FORMAT + ret );
}
if( ( ret = x509_get_pubkey( &p, end, &alg_oid, &rsa->N, &rsa->E ) ) != 0 )
if( ( ret = x509_get_pubkey( &p, end, &rsa->N, &rsa->E ) ) != 0 )
{
#if defined(POLARSSL_PEM_C)
pem_free( &pem );