s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e89...

[amitay/samba.git] / source4 / heimdal / lib / hdb / hdb.asn1

diff --git a/source4/heimdal/lib/hdb/hdb.asn1 b/source4/heimdal/lib/hdb/hdb.asn1
index 5cddf8f1d0536d2d26dabcab87f9692c10a61a84..c2abd4af73ee78b71984f33d75ba5899e12c9f77 100644 (file)
--- a/source4/heimdal/lib/hdb/hdb.asn1
+++ b/source4/heimdal/lib/hdb/hdb.asn1
@@ -13,7 +13,8 @@ hdb-afs3-salt INTEGER ::= 10
 
 Salt ::= SEQUENCE {
        type[0]         INTEGER (0..4294967295),
-       salt[1]         OCTET STRING
+       salt[1]         OCTET STRING,
+       opaque[2]       OCTET STRING OPTIONAL
 }
 
 Key ::= SEQUENCE {
@@ -64,6 +65,10 @@ HDB-Ext-PKINIT-hash ::= SEQUENCE OF SEQUENCE {
        digest[1] OCTET STRING
 }
 
+HDB-Ext-PKINIT-cert ::= SEQUENCE OF SEQUENCE {
+       cert[0] OCTET STRING
+}
+
 HDB-Ext-Constrained-delegation-acl ::= SEQUENCE OF Principal
 
 -- hdb-ext-referrals ::= PA-SERVER-REFERRAL-DATA
@@ -94,6 +99,7 @@ HDB-extension ::= SEQUENCE {
                password[5]                     HDB-Ext-Password,
                aliases[6]                      HDB-Ext-Aliases,
                last-pw-change[7]               KerberosTime,
+               pkinit-cert[8]                  HDB-Ext-PKINIT-cert,
                ...
        },
        ...
@@ -101,6 +107,10 @@ HDB-extension ::= SEQUENCE {
 
 HDB-extensions ::= SEQUENCE OF HDB-extension
 
+hdb_keyset ::= SEQUENCE {
+       kvno[1]         INTEGER (0..4294967295),
+       keys[0]         SEQUENCE OF Key
+}
 
 hdb_entry ::= SEQUENCE {
        principal[0]    Principal  OPTIONAL, -- this is optional only