oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

asn1/hx509: Undo workaround for fixed bug

Browse Source 
Now that the ASN.1 compiler properly supports IMPLICIT tagging of named
CHOICE types (meaning: treat them as EXPLICIT tags), we can remove one
workaround for that.
This commit is contained in:
Nicolas Williams
2021-01-24 21:36:26 -06:00
parent 17b1e809ba
commit 35ad30b2b3
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asn1/rfc2459.asn1
View File

@@ -298,9 +298,7 @@ GeneralName ::= CHOICE {
rfc822Name [1] IMPLICIT IA5String, rfc822Name [1] IMPLICIT IA5String,
dNSName [2] IMPLICIT IA5String, dNSName [2] IMPLICIT IA5String,
-- x400Address [3] IMPLICIT ORAddress,-- -- x400Address [3] IMPLICIT ORAddress,--
directoryName [4] IMPLICIT -- Name -- CHOICE { directoryName [4] IMPLICIT Name,
rdnSequence RDNSequence
},
-- ediPartyName [5] IMPLICIT EDIPartyName, -- -- ediPartyName [5] IMPLICIT EDIPartyName, --
uniformResourceIdentifier [6] IMPLICIT IA5String, uniformResourceIdentifier [6] IMPLICIT IA5String,
iPAddress [7] IMPLICIT OCTET STRING, iPAddress [7] IMPLICIT OCTET STRING,

3
lib/hx509/ca.c
View File

@@ -2194,8 +2194,7 @@ get_AuthorityKeyIdentifier(hx509_context context,
memset(&gn, 0, sizeof(gn)); memset(&gn, 0, sizeof(gn));
gn.element = choice_GeneralName_directoryName; gn.element = choice_GeneralName_directoryName;
gn.u.directoryName.element = gn.u.directoryName.element = choice_GeneralName_directoryName;
choice_GeneralName_directoryName_rdnSequence;
gn.u.directoryName.u.rdnSequence = name.u.rdnSequence; gn.u.directoryName.u.rdnSequence = name.u.rdnSequence;
ret = add_GeneralNames(&gns, &gn); ret = add_GeneralNames(&gns, &gn);

2
lib/hx509/cert.c
View File

@@ -2074,7 +2074,7 @@ match_tree(const GeneralSubtrees *t, const Certificate *c, int *match)
memset(&certname, 0, sizeof(certname)); memset(&certname, 0, sizeof(certname));
certname.element = choice_GeneralName_directoryName; certname.element = choice_GeneralName_directoryName;
certname.u.directoryName.element = (enum GeneralName_directoryName_enum) certname.u.directoryName.element = (enum Name_enum)
c->tbsCertificate.subject.element; c->tbsCertificate.subject.element;
certname.u.directoryName.u.rdnSequence = certname.u.directoryName.u.rdnSequence =
c->tbsCertificate.subject.u.rdnSequence; c->tbsCertificate.subject.u.rdnSequence;

3
lib/hx509/req.c
View File

@@ -1360,8 +1360,7 @@ hx509_request_get_san(hx509_request req,
case HX509_SAN_TYPE_DN: { case HX509_SAN_TYPE_DN: {
Name name; Name name;
if (san->u.directoryName.element == if (san->u.directoryName.element == choice_Name_rdnSequence) {
choice_GeneralName_directoryName_rdnSequence) {
name.element = choice_Name_rdnSequence; name.element = choice_Name_rdnSequence;
name.u.rdnSequence = san->u.directoryName.u.rdnSequence; name.u.rdnSequence = san->u.directoryName.u.rdnSequence;
return _hx509_Name_to_string(&name, out); return _hx509_Name_to_string(&name, out);