Merge lorikeet-heimdal -r 787 into Samba4 tree.

[kai/samba.git] / source4 / heimdal / lib / asn1 / pkinit.asn1

diff --git a/source4/heimdal/lib/asn1/pkinit.asn1 b/source4/heimdal/lib/asn1/pkinit.asn1
index e89a7217af5f9737726b5dfd3237c317e6bac5a2..989b26581b3a1b69eea569b96e37bbef624da33a 100644 (file)
--- a/source4/heimdal/lib/asn1/pkinit.asn1
+++ b/source4/heimdal/lib/asn1/pkinit.asn1
@@ -2,7 +2,7 @@
 
 PKINIT DEFINITIONS ::= BEGIN
 
-IMPORTS EncryptionKey, PrincipalName, Realm, KerberosTime, Checksum FROM krb5
+IMPORTS EncryptionKey, PrincipalName, Realm, KerberosTime, Checksum, Ticket FROM krb5
        IssuerAndSerialNumber, ContentInfo FROM cms
        SubjectPublicKeyInfo, AlgorithmIdentifier FROM rfc2459
        heim_any FROM heim;
@@ -34,14 +34,17 @@ MS-UPN-SAN ::= UTF8String
 pa-pk-as-req INTEGER ::=                  16
 pa-pk-as-rep INTEGER ::=                  17
 
-ad-initial-verified-cas INTEGER ::=        9
-
 td-trusted-certifiers INTEGER ::=        104
 td-invalid-certificates INTEGER ::=      105
 td-dh-parameters INTEGER ::=             109
 
 DHNonce ::= OCTET STRING
 
+KDFAlgorithmId ::= SEQUENCE {
+       kdf-id            [0] OBJECT IDENTIFIER,
+       ...
+}
+
 TrustedCA ::= SEQUENCE {
        caName                  [0] IMPLICIT OCTET STRING,
        certificateSerialNumber [1] INTEGER OPTIONAL,
@@ -78,6 +81,8 @@ AuthPack ::= SEQUENCE {
        clientPublicValue       [1] SubjectPublicKeyInfo OPTIONAL,
        supportedCMSTypes       [2] SEQUENCE OF AlgorithmIdentifier OPTIONAL,
        clientDHNonce           [3] DHNonce OPTIONAL,
+       ...,
+       supportedKDFs           [4] SEQUENCE OF KDFAlgorithmId OPTIONAL,
        ...
 }
 
@@ -91,10 +96,12 @@ KRB5PrincipalName ::= SEQUENCE {
 
 AD-INITIAL-VERIFIED-CAS ::= SEQUENCE OF ExternalPrincipalIdentifier
 
-
 DHRepInfo ::= SEQUENCE {
        dhSignedData            [0] IMPLICIT OCTET STRING,
-       serverDHNonce           [1] DHNonce OPTIONAL
+       serverDHNonce           [1] DHNonce OPTIONAL,
+       ...,
+       kdf                     [2] KDFAlgorithmId OPTIONAL,
+       ...
 }
 
 PA-PK-AS-REP ::= CHOICE {
@@ -160,8 +167,16 @@ KDCDHKeyInfo-Win2k ::= SEQUENCE {
 
 ReplyKeyPack-Win2k ::= SEQUENCE {
         replyKey                [0] EncryptionKey,
-        nonce                   [1] INTEGER (0..4294967295),
+        nonce                   [1] INTEGER (-2147483648..2147483647),
        ...
 }
 
+PkinitSuppPubInfo ::= SEQUENCE {
+       enctype           [0] INTEGER (-2147483648..2147483647),
+       as-REQ            [1] OCTET STRING,
+       pk-as-rep         [2] OCTET STRING,
+       ticket            [3] Ticket,
+       ...
+}
+
 END