From ad8050e056b4875aa12f42e462d1f510fb589133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Thu, 21 Jul 2005 10:20:16 +0000 Subject: [PATCH] some of the structure are in the IMPLICIT TAGS module, adapt git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15691 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/asn1/rfc2459.asn1 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/asn1/rfc2459.asn1 b/lib/asn1/rfc2459.asn1 index 8ba58008b..87a0ec539 100644 --- a/lib/asn1/rfc2459.asn1 +++ b/lib/asn1/rfc2459.asn1 @@ -161,15 +161,15 @@ OtherName ::= SEQUENCE { } GeneralName ::= CHOICE { - otherName [0] OtherName, - rfc822Name [1] IA5String, - dNSName [2] IA5String, --- x400Address [3] ORAddress,-- - directoryName [4] Name, --- ediPartyName [5] EDIPartyName, -- - uniformResourceIdentifier [6] IA5String, - iPAddress [7] OCTET STRING, - registeredID [8] OBJECT IDENTIFIER + otherName [0] IMPLICIT OtherName, + rfc822Name [1] IMPLICIT IA5String, + dNSName [2] IMPLICIT IA5String, +-- x400Address [3] IMPLICIT ORAddress,-- + directoryName [4] IMPLICIT Name, +-- ediPartyName [5] IMPLICIT EDIPartyName, -- + uniformResourceIdentifier [6] IMPLICIT IA5String, + iPAddress [7] IMPLICIT OCTET STRING, + registeredID [8] IMPLICIT OBJECT IDENTIFIER } GeneralNames ::= SEQUENCE -- SIZE (1..MAX) -- OF GeneralName @@ -215,15 +215,15 @@ BaseDistance ::= INTEGER -- (0..MAX) -- GeneralSubtree ::= SEQUENCE { base GeneralName, - minimum [0] BaseDistance OPTIONAL -- DEFAULT 0 --, - maximum [1] BaseDistance OPTIONAL + minimum [0] IMPLICIT BaseDistance OPTIONAL -- DEFAULT 0 --, + maximum [1] IMPLICIT BaseDistance OPTIONAL } GeneralSubtrees ::= SEQUENCE -- SIZE (1..MAX) -- OF GeneralSubtree NameConstraints ::= SEQUENCE { - permittedSubtrees [0] GeneralSubtrees OPTIONAL, - excludedSubtrees [1] GeneralSubtrees OPTIONAL + permittedSubtrees [0] IMPLICIT GeneralSubtrees OPTIONAL, + excludedSubtrees [1] IMPLICIT GeneralSubtrees OPTIONAL } id-x509-ce-privateKeyUsagePeriod OBJECT IDENTIFIER ::= { id-x509-ce 16 }