r23456: Update Samba4 to current lorikeet-heimdal.

[sfrench/samba-autobuild/.git] / source4 / heimdal / lib / asn1 / rfc2459.asn1

diff --git a/source4/heimdal/lib/asn1/rfc2459.asn1 b/source4/heimdal/lib/asn1/rfc2459.asn1
index 430674a5ee8c79644737f325e5d0297941e9f508..71f197eba7734ebfee8ef1e969b6dd9845a9d0f6 100644 (file)
--- a/source4/heimdal/lib/asn1/rfc2459.asn1
+++ b/source4/heimdal/lib/asn1/rfc2459.asn1
@@ -87,6 +87,7 @@ id-at-serialNumber            OBJECT IDENTIFIER ::= { id-x520-at 5 }
 id-at-countryName              OBJECT IDENTIFIER ::= { id-x520-at 6 }
 id-at-localityName             OBJECT IDENTIFIER ::= { id-x520-at 7 }
 id-at-stateOrProvinceName      OBJECT IDENTIFIER ::= { id-x520-at 8 }
+id-at-streetAddress            OBJECT IDENTIFIER ::= { id-x520-at 9 }
 id-at-organizationName         OBJECT IDENTIFIER ::= { id-x520-at 10 }
 id-at-organizationalUnitName   OBJECT IDENTIFIER ::= { id-x520-at 11 }
 id-at-name                     OBJECT IDENTIFIER ::= { id-x520-at 41 }
@@ -306,6 +307,32 @@ id-x509-ce-invalidityDate OBJECT IDENTIFIER ::= { id-x509-ce 24 }
 id-x509-ce-certificateIssuer   OBJECT IDENTIFIER ::= { id-x509-ce 29 }
 id-x509-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-x509-ce 54 }
 
+DistributionPointReasonFlags ::= BIT STRING {
+       unused                  (0),
+       keyCompromise           (1),
+       cACompromise            (2),
+       affiliationChanged      (3),
+       superseded              (4),
+       cessationOfOperation    (5),
+       certificateHold         (6),
+       privilegeWithdrawn      (7),
+       aACompromise            (8)
+}
+
+DistributionPointName ::= CHOICE {
+       fullName                [0]     IMPLICIT -- GeneralNames --  SEQUENCE -- SIZE (1..MAX) -- OF GeneralName,
+       nameRelativeToCRLIssuer [1]     RelativeDistinguishedName
+}
+
+DistributionPoint ::= SEQUENCE {
+       distributionPoint       [0]     IMPLICIT heim_any -- DistributionPointName -- OPTIONAL,
+       reasons                 [1]     IMPLICIT heim_any -- DistributionPointReasonFlags -- OPTIONAL,
+       cRLIssuer               [2]     IMPLICIT heim_any -- GeneralNames -- OPTIONAL
+}
+
+CRLDistributionPoints ::= SEQUENCE -- SIZE (1..MAX) -- OF DistributionPoint
+
+
 -- rfc3279
 
 DSASigValue  ::=  SEQUENCE {
@@ -406,10 +433,13 @@ CRLReason ::= ENUMERATED {
        aACompromise           (10)
 }
 
+PKIXXmppAddr ::= UTF8String
+
 id-pkix OBJECT IDENTIFIER ::= { iso(1) identified-organization(3)
             dod(6) internet(1) security(5) mechanisms(5) pkix(7) }
 
 id-pkix-on OBJECT IDENTIFIER ::= { id-pkix 8 }
+id-pkix-on-xmppAddr OBJECT IDENTIFIER ::= { id-pkix-on 5 }
 id-pkix-on-dnsSRV OBJECT IDENTIFIER ::= { id-pkix-on 7 }
 
 id-pkix-kp OBJECT IDENTIFIER ::= { id-pkix 3 }
@@ -441,4 +471,25 @@ ProxyCertInfo ::= SEQUENCE {
        proxyPolicy             ProxyPolicy
 }
 
+--- U.S. Federal PKI Common Policy Framework
+-- Card Authentication key
+id-uspkicommon-card-id OBJECT IDENTIFIER ::= { 2 16 840 1 101 3 6 6 }
+id-uspkicommon-piv-interim OBJECT IDENTIFIER ::= { 2 16 840 1 101 3 6 9 1 }
+
+--- Netscape extentions
+
+id-netscape OBJECT IDENTIFIER ::= 
+    { joint-iso-itu-t(2) country(16) us(840) organization(1) netscape(113730) }
+id-netscape-cert-comment OBJECT IDENTIFIER ::= { id-netscape 1 13 }
+
+--- MS extentions
+
+id-ms-cert-enroll-domaincontroller OBJECT IDENTIFIER ::= 
+    { 1 3 6 1 4 1 311 20 2 }
+
+id-ms-client-authentication OBJECT IDENTIFIER ::= 
+ { 1 3 6 1 5 5 7 3 2 }
+
+-- DER:1e:20:00:44:00:6f:00:6d:00:61:00:69:00:6e:00:43:00:6f:00:6e:00:74:00:72:00:6f:00:6c:00:6c:00:65:00:72
+
 END