yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 18:35:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make support for SpecifiedECDomain optional

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-03-19 16:39:52 +01:00
parent 5246ee5c59
commit 6fac3515d0
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/polarssl/config.h
View File

@ -587,6 +587,20 @@
*/ */
#define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED #define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
/**
* \def POLARSSL_PK_PARSE_EC_EXTENDED
*
* Enhance support for reading EC keys using variants of SEC1 not allowed by
* RFC 5915 and RFC 5480.
*
* Currently this means parsing the SpecifiedECDomain choice of EC
* parameters (only known groups are supported, not arbitrary domains, to
* avoid validation issues).
*
* Disable if you only need to support RFC 5915 + 5480 key formats.
*/
#define POLARSSL_PK_PARSE_EC_EXTENDED
/** /**
* \def POLARSSL_ERROR_STRERROR_BC * \def POLARSSL_ERROR_STRERROR_BC
* *

13
library/pkparse.c
View File

@ -163,8 +163,11 @@ static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
/* Tag may be either OID or SEQUENCE */ /* Tag may be either OID or SEQUENCE */
params->tag = **p; params->tag = **p;
if( params->tag != ASN1_OID && if( params->tag != ASN1_OID
params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) #if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
&& params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE )
#endif
)
{ {
return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT + return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT +
POLARSSL_ERR_ASN1_UNEXPECTED_TAG ); POLARSSL_ERR_ASN1_UNEXPECTED_TAG );
@ -185,6 +188,7 @@ static int pk_get_ecparams( unsigned char **p, const unsigned char *end,
return( 0 ); return( 0 );
} }
#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
/* /*
* Parse a SpecifiedECDomain (SEC 1 C.2) and (mostly) fill the group with it. * Parse a SpecifiedECDomain (SEC 1 C.2) and (mostly) fill the group with it.
* WARNING: the resulting group should only be used with * WARNING: the resulting group should only be used with
@ -411,6 +415,7 @@ cleanup:
return( ret ); return( ret );
} }
#endif /* POLARSSL_PK_PARSE_EC_EXTENDED */
/* /*
* Use EC parameters to initialise an EC group * Use EC parameters to initialise an EC group
@ -432,8 +437,12 @@ static int pk_use_ecparams( const asn1_buf *params, ecp_group *grp )
} }
else else
{ {
#if defined(POLARSSL_PK_PARSE_EC_EXTENDED)
if( ( ret = pk_group_id_from_specified( params, &grp_id ) ) != 0 ) if( ( ret = pk_group_id_from_specified( params, &grp_id ) ) != 0 )
return( ret ); return( ret );
#else
return( POLARSSL_ERR_PK_KEY_INVALID_FORMAT );
#endif
} }
/* /*