diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-25 18:51:53 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-26 02:16:08 +0200 |
| commit | 5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b (patch) | |
| tree | a9a73cdf05ce487a174c9ef7ab334007348e7248 /source4/heimdal/lib/krb5/krb5.h | |
| parent | f1a59f9d6f45987acd0304ee58e4488333faad18 (diff) | |
| download | samba-5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b.tar.gz samba-5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b.tar.bz2 samba-5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b.zip | |
s4:heimdal: import lorikeet-heimdal-201107241840 (commit 0fdf11fa3cdb47df9f5393ebf36d9f5742243036)
Diffstat (limited to 'source4/heimdal/lib/krb5/krb5.h')
| -rw-r--r-- | source4/heimdal/lib/krb5/krb5.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source4/heimdal/lib/krb5/krb5.h b/source4/heimdal/lib/krb5/krb5.h index 2224b92e95..9c0f566946 100644 --- a/source4/heimdal/lib/krb5/krb5.h +++ b/source4/heimdal/lib/krb5/krb5.h @@ -326,7 +326,9 @@ typedef HostAddress krb5_address; typedef HostAddresses krb5_addresses; -typedef enum krb5_keytype { +typedef krb5_enctype krb5_keytype; + +enum krb5_keytype_old { KEYTYPE_NULL = ETYPE_NULL, KEYTYPE_DES = ETYPE_DES_CBC_CRC, KEYTYPE_DES3 = ETYPE_OLD_DES3_CBC_SHA1, @@ -334,7 +336,7 @@ typedef enum krb5_keytype { KEYTYPE_AES256 = ETYPE_AES256_CTS_HMAC_SHA1_96, KEYTYPE_ARCFOUR = ETYPE_ARCFOUR_HMAC_MD5, KEYTYPE_ARCFOUR_56 = ETYPE_ARCFOUR_HMAC_MD5_56 -} krb5_keytype; +}; typedef EncryptionKey krb5_keyblock; @@ -876,6 +878,11 @@ typedef struct { typedef krb5_error_code (KRB5_CALLCONV * krb5_gic_process_last_req)(krb5_context, krb5_last_req_entry **, void *); +typedef struct { + krb5_enctype ks_enctype; + krb5int32 ks_salttype; +}krb5_key_salt_tuple; + /* * */ |