sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-15 00:00:16 -04:00
Code Issues Projects Releases Wiki Activity

the parameters field in an ASN.1 algorithmIdentifier is optional

Browse Source
This commit is contained in:
Andreas Steffen 2009-03-13 20:22:24 +00:00
parent 8da9bd0c75
commit 8065780f4a
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libstrongswan/asn1/asn1.c
View File

@ -452,13 +452,6 @@ bool asn1_parse_simple_object(chunk_t *object, asn1_t type, u_int level, const c
* ASN.1 definition of an algorithmIdentifier * ASN.1 definition of an algorithmIdentifier
*/ */
static const asn1Object_t algorithmIdentifierObjects[] = { static const asn1Object_t algorithmIdentifierObjects[] = {
{ 0, "algorithmIdentifier", ASN1_SEQUENCE, ASN1_NONE }, /* 0 */
{ 1, "algorithm", ASN1_OID, ASN1_BODY }, /* 1 */
{ 1, "parameters", ASN1_EOC, ASN1_RAW }, /* 2 */
{ 0, "exit", ASN1_EOC, ASN1_EXIT }
};
/* parameters are optional in case of ecdsa-with-SHA1 as algorithm (RFC 3279) */
static const asn1Object_t algorithmIdentifierObjectsOptional[] = {
{ 0, "algorithmIdentifier", ASN1_SEQUENCE, ASN1_NONE }, /* 0 */ { 0, "algorithmIdentifier", ASN1_SEQUENCE, ASN1_NONE }, /* 0 */
{ 1, "algorithm", ASN1_OID, ASN1_BODY }, /* 1 */ { 1, "algorithm", ASN1_OID, ASN1_BODY }, /* 1 */
{ 1, "parameters", ASN1_EOC, ASN1_RAW|ASN1_OPT }, /* 2 */ { 1, "parameters", ASN1_EOC, ASN1_RAW|ASN1_OPT }, /* 2 */
@ -477,14 +470,8 @@ int asn1_parse_algorithmIdentifier(chunk_t blob, int level0, chunk_t *parameters
chunk_t object; chunk_t object;
int objectID; int objectID;
int alg = OID_UNKNOWN; int alg = OID_UNKNOWN;
const asn1Object_t *objects = algorithmIdentifierObjectsOptional;
if (parameters != NULL) parser = asn1_parser_create(algorithmIdentifierObjects, blob);
{
objects = algorithmIdentifierObjects;
}
parser = asn1_parser_create(objects, blob);
parser->set_top_level(parser, level0); parser->set_top_level(parser, level0);
while (parser->iterate(parser, &objectID, &object)) while (parser->iterate(parser, &objectID, &object))

8
src/pluto/asn1.c
View File

@ -75,17 +75,19 @@ const chunk_t ASN1_rsaEncryption_id = strchunk(ASN1_rsaEncryption_id_str);
const chunk_t ASN1_md5WithRSA_id = strchunk(ASN1_md5WithRSA_id_str); const chunk_t ASN1_md5WithRSA_id = strchunk(ASN1_md5WithRSA_id_str);
const chunk_t ASN1_sha1WithRSA_id = strchunk(ASN1_sha1WithRSA_id_str); const chunk_t ASN1_sha1WithRSA_id = strchunk(ASN1_sha1WithRSA_id_str);
/* ASN.1 definiton of an algorithmIdentifier */ /* ASN.1 definition of an algorithmIdentifier */
static const asn1Object_t algorithmIdentifierObjects[] = { static const asn1Object_t algorithmIdentifierObjects[] = {
{ 0, "algorithmIdentifier", ASN1_SEQUENCE, ASN1_NONE }, /* 0 */ { 0, "algorithmIdentifier", ASN1_SEQUENCE, ASN1_NONE }, /* 0 */
{ 1, "algorithm", ASN1_OID, ASN1_BODY }, /* 1 */ { 1, "algorithm", ASN1_OID, ASN1_BODY }, /* 1 */
{ 1, "parameters", ASN1_EOC, ASN1_RAW } /* 2 */ { 1, "parameters", ASN1_EOC, ASN1_OPT |
ASN1_RAW }, /* 2 */
{ 1, "end opt", ASN1_EOC, ASN1_END } /* 3 */
}; };
#define ALGORITHM_ID_ALG 1 #define ALGORITHM_ID_ALG 1
#define ALGORITHM_ID_PARAMETERS 2 #define ALGORITHM_ID_PARAMETERS 2
#define ALGORITHM_ID_ROOF 3 #define ALGORITHM_ID_ROOF 4
/* /*
* return the ASN.1 encoded algorithm identifier * return the ASN.1 encoded algorithm identifier