mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-29 04:20:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename x509_get_algid() to x509_get_pk_alg()

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-07-10 12:55:08 +02:00 committed by Paul Bakker
parent 7c5819eb1e
commit 7a287c409e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/x509parse.c
View File

@ -166,7 +166,7 @@ static int x509_get_serial( unsigned char **p,
* algorithm OBJECT IDENTIFIER, * algorithm OBJECT IDENTIFIER,
* parameters ANY DEFINED BY algorithm OPTIONAL } * parameters ANY DEFINED BY algorithm OPTIONAL }
*/ */
static int x509_get_algid( unsigned char **p, static int x509_get_pk_alg( unsigned char **p,
const unsigned char *end, const unsigned char *end,
pk_type_t *pk_alg, x509_buf *params ) pk_type_t *pk_alg, x509_buf *params )
{ {
@ -614,7 +614,7 @@ static int x509_get_pubkey( unsigned char **p,
end = *p + len; end = *p + len;
if( ( ret = x509_get_algid( p, end, &pk_alg, &alg_params ) ) != 0 ) if( ( ret = x509_get_pk_alg( p, end, &pk_alg, &alg_params ) ) != 0 )
return( ret ); return( ret );
if( ( ret = asn1_get_tag( p, end, &len, ASN1_BIT_STRING ) ) != 0 ) if( ( ret = asn1_get_tag( p, end, &len, ASN1_BIT_STRING ) ) != 0 )
@ -2813,7 +2813,7 @@ static int x509parse_key_pkcs8_unencrypted_der_ec(
if( version != 0 ) if( version != 0 )
return( POLARSSL_ERR_X509_KEY_INVALID_VERSION + ret ); return( POLARSSL_ERR_X509_KEY_INVALID_VERSION + ret );
if( ( ret = x509_get_algid( &p, end, &pk_alg, &alg_params ) ) != 0 ) if( ( ret = x509_get_pk_alg( &p, end, &pk_alg, &alg_params ) ) != 0 )
return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret ); return( POLARSSL_ERR_X509_KEY_INVALID_FORMAT + ret );
if( pk_alg != POLARSSL_PK_ECKEY && pk_alg != POLARSSL_PK_ECKEY_DH ) if( pk_alg != POLARSSL_PK_ECKEY && pk_alg != POLARSSL_PK_ECKEY_DH )