oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

partly unify enctype/keytype since there is only enctypes

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2011-07-24 14:03:08 -07:00
parent 16eabf8e4c
commit f60ec15834
14 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krb5/krb5.h
View File

@@ -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;