From 7a287c409e56d1f70ff885291e264097a7ceb23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 10 Jul 2013 12:55:08 +0200 Subject: [PATCH] Rename x509_get_algid() to x509_get_pk_alg() --- library/x509parse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/x509parse.c b/library/x509parse.c index 62396987b..e70cee98e 100644 --- a/library/x509parse.c +++ b/library/x509parse.c @@ -166,7 +166,7 @@ static int x509_get_serial( unsigned char **p, * algorithm OBJECT IDENTIFIER, * 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, pk_type_t *pk_alg, x509_buf *params ) { @@ -614,7 +614,7 @@ static int x509_get_pubkey( unsigned char **p, 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 ); 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 ) 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 ); if( pk_alg != POLARSSL_PK_ECKEY && pk_alg != POLARSSL_PK_ECKEY_DH )