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

change prefix ETYPE_ to KRB5_ENCTYPE_ and provide compat symbols

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2011-05-22 14:06:40 -07:00
parent 3564726537
commit 48a91b7fc5
2 changed files with 70 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/asn1/krb5.asn1
View File

@@ -221,32 +221,32 @@ CKSUMTYPE ::= INTEGER {
--enctypes --enctypes
ENCTYPE ::= INTEGER { ENCTYPE ::= INTEGER {
ETYPE_NULL(0), KRB5_ENCTYPE_NULL(0),
ETYPE_DES_CBC_CRC(1), KRB5_ENCTYPE_DES_CBC_CRC(1),
ETYPE_DES_CBC_MD4(2), KRB5_ENCTYPE_DES_CBC_MD4(2),
ETYPE_DES_CBC_MD5(3), KRB5_ENCTYPE_DES_CBC_MD5(3),
ETYPE_DES3_CBC_MD5(5), KRB5_ENCTYPE_DES3_CBC_MD5(5),
ETYPE_OLD_DES3_CBC_SHA1(7), KRB5_ENCTYPE_OLD_DES3_CBC_SHA1(7),
ETYPE_SIGN_DSA_GENERATE(8), KRB5_ENCTYPE_SIGN_DSA_GENERATE(8),
ETYPE_ENCRYPT_RSA_PRIV(9), KRB5_ENCTYPE_ENCRYPT_RSA_PRIV(9),
ETYPE_ENCRYPT_RSA_PUB(10), KRB5_ENCTYPE_ENCRYPT_RSA_PUB(10),
ETYPE_DES3_CBC_SHA1(16), -- with key derivation KRB5_ENCTYPE_DES3_CBC_SHA1(16), -- with key derivation
ETYPE_AES128_CTS_HMAC_SHA1_96(17), KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96(17),
ETYPE_AES256_CTS_HMAC_SHA1_96(18), KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96(18),
ETYPE_ARCFOUR_HMAC_MD5(23), KRB5_ENCTYPE_ARCFOUR_HMAC_MD5(23),
ETYPE_ARCFOUR_HMAC_MD5_56(24), KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56(24),
ETYPE_ENCTYPE_PK_CROSS(48), KRB5_ENCTYPE_ENCTYPE_PK_CROSS(48),
-- some "old" windows types -- some "old" windows types
ETYPE_ARCFOUR_MD4(-128), KRB5_ENCTYPE_ARCFOUR_MD4(-128),
ETYPE_ARCFOUR_HMAC_OLD(-133), KRB5_ENCTYPE_ARCFOUR_HMAC_OLD(-133),
ETYPE_ARCFOUR_HMAC_OLD_EXP(-135), KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP(-135),
-- these are for Heimdal internal use -- these are for Heimdal internal use
ETYPE_DES_CBC_NONE(-0x1000), KRB5_ENCTYPE_DES_CBC_NONE(-0x1000),
ETYPE_DES3_CBC_NONE(-0x1001), KRB5_ENCTYPE_DES3_CBC_NONE(-0x1001),
ETYPE_DES_CFB64_NONE(-0x1002), KRB5_ENCTYPE_DES_CFB64_NONE(-0x1002),
ETYPE_DES_PCBC_NONE(-0x1003), KRB5_ENCTYPE_DES_PCBC_NONE(-0x1003),
ETYPE_DIGEST_MD5_NONE(-0x1004), -- private use, lukeh@padl.com KRB5_ENCTYPE_DIGEST_MD5_NONE(-0x1004), -- private use, lukeh@padl.com
ETYPE_CRAM_MD5_NONE(-0x1005) -- private use, lukeh@padl.com KRB5_ENCTYPE_CRAM_MD5_NONE(-0x1005) -- private use, lukeh@padl.com
} }
@@ -625,7 +625,7 @@ ChangePasswdDataMS ::= SEQUENCE {
targrealm[2] Realm OPTIONAL targrealm[2] Realm OPTIONAL
} }
EtypeList ::= SEQUENCE OF krb5int32 EtypeList ::= SEQUENCE OF ENCTYPE
-- the client's proposed enctype list in -- the client's proposed enctype list in
-- decreasing preference order, favorite choice first -- decreasing preference order, favorite choice first

65
lib/krb5/krb5.h
View File

@@ -118,26 +118,51 @@ typedef struct krb5_enc_data {
/* alternative names */ /* alternative names */
enum { enum {
ENCTYPE_NULL = ETYPE_NULL, ENCTYPE_NULL = KRB5_ENCTYPE_NULL,
ENCTYPE_DES_CBC_CRC = ETYPE_DES_CBC_CRC, ENCTYPE_DES_CBC_CRC = KRB5_ENCTYPE_DES_CBC_CRC,
ENCTYPE_DES_CBC_MD4 = ETYPE_DES_CBC_MD4, ENCTYPE_DES_CBC_MD4 = KRB5_ENCTYPE_DES_CBC_MD4,
ENCTYPE_DES_CBC_MD5 = ETYPE_DES_CBC_MD5, ENCTYPE_DES_CBC_MD5 = KRB5_ENCTYPE_DES_CBC_MD5,
ENCTYPE_DES3_CBC_MD5 = ETYPE_DES3_CBC_MD5, ENCTYPE_DES3_CBC_MD5 = KRB5_ENCTYPE_DES3_CBC_MD5,
ENCTYPE_OLD_DES3_CBC_SHA1 = ETYPE_OLD_DES3_CBC_SHA1, ENCTYPE_OLD_DES3_CBC_SHA1 = KRB5_ENCTYPE_OLD_DES3_CBC_SHA1,
ENCTYPE_SIGN_DSA_GENERATE = ETYPE_SIGN_DSA_GENERATE, ENCTYPE_SIGN_DSA_GENERATE = KRB5_ENCTYPE_SIGN_DSA_GENERATE,
ENCTYPE_ENCRYPT_RSA_PRIV = ETYPE_ENCRYPT_RSA_PRIV, ENCTYPE_ENCRYPT_RSA_PRIV = KRB5_ENCTYPE_ENCRYPT_RSA_PRIV,
ENCTYPE_ENCRYPT_RSA_PUB = ETYPE_ENCRYPT_RSA_PUB, ENCTYPE_ENCRYPT_RSA_PUB = KRB5_ENCTYPE_ENCRYPT_RSA_PUB,
ENCTYPE_DES3_CBC_SHA1 = ETYPE_DES3_CBC_SHA1, ENCTYPE_DES3_CBC_SHA1 = KRB5_ENCTYPE_DES3_CBC_SHA1,
ENCTYPE_AES128_CTS_HMAC_SHA1_96 = ETYPE_AES128_CTS_HMAC_SHA1_96, ENCTYPE_AES128_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
ENCTYPE_AES256_CTS_HMAC_SHA1_96 = ETYPE_AES256_CTS_HMAC_SHA1_96, ENCTYPE_AES256_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
ENCTYPE_ARCFOUR_HMAC = ETYPE_ARCFOUR_HMAC_MD5, ENCTYPE_ARCFOUR_HMAC = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
ENCTYPE_ARCFOUR_HMAC_MD5 = ETYPE_ARCFOUR_HMAC_MD5, ENCTYPE_ARCFOUR_HMAC_MD5 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
ENCTYPE_ARCFOUR_HMAC_MD5_56 = ETYPE_ARCFOUR_HMAC_MD5_56, ENCTYPE_ARCFOUR_HMAC_MD5_56 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56,
ENCTYPE_ENCTYPE_PK_CROSS = ETYPE_ENCTYPE_PK_CROSS, ENCTYPE_ENCTYPE_PK_CROSS = KRB5_ENCTYPE_ENCTYPE_PK_CROSS,
ENCTYPE_DES_CBC_NONE = ETYPE_DES_CBC_NONE, ENCTYPE_DES_CBC_NONE = KRB5_ENCTYPE_DES_CBC_NONE,
ENCTYPE_DES3_CBC_NONE = ETYPE_DES3_CBC_NONE, ENCTYPE_DES3_CBC_NONE = KRB5_ENCTYPE_DES3_CBC_NONE,
ENCTYPE_DES_CFB64_NONE = ETYPE_DES_CFB64_NONE, ENCTYPE_DES_CFB64_NONE = KRB5_ENCTYPE_DES_CFB64_NONE,
ENCTYPE_DES_PCBC_NONE = ETYPE_DES_PCBC_NONE ENCTYPE_DES_PCBC_NONE = KRB5_ENCTYPE_DES_PCBC_NONE,
ETYPE_NULL = KRB5_ENCTYPE_NULL,
ETYPE_DES_CBC_CRC = KRB5_ENCTYPE_DES_CBC_CRC,
ETYPE_DES_CBC_MD4 = KRB5_ENCTYPE_DES_CBC_MD4,
ETYPE_DES_CBC_MD5 = KRB5_ENCTYPE_DES_CBC_MD5,
ETYPE_DES3_CBC_MD5 = KRB5_ENCTYPE_DES3_CBC_MD5,
ETYPE_OLD_DES3_CBC_SHA1 = KRB5_ENCTYPE_OLD_DES3_CBC_SHA1,
ETYPE_SIGN_DSA_GENERATE = KRB5_ENCTYPE_SIGN_DSA_GENERATE,
ETYPE_ENCRYPT_RSA_PRIV = KRB5_ENCTYPE_ENCRYPT_RSA_PRIV,
ETYPE_ENCRYPT_RSA_PUB = KRB5_ENCTYPE_ENCRYPT_RSA_PUB,
ETYPE_DES3_CBC_SHA1 = KRB5_ENCTYPE_DES3_CBC_SHA1,
ETYPE_AES128_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
ETYPE_AES256_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
ETYPE_ARCFOUR_HMAC_MD5 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
ETYPE_ARCFOUR_HMAC_MD5_56 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56,
ETYPE_ENCTYPE_PK_CROSS = KRB5_ENCTYPE_ENCTYPE_PK_CROSS,
ETYPE_ARCFOUR_MD4 = KRB5_ENCTYPE_ARCFOUR_MD4,
ETYPE_ARCFOUR_HMAC_OLD = KRB5_ENCTYPE_ARCFOUR_HMAC_OLD,
ETYPE_ARCFOUR_HMAC_OLD_EXP = KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP,
ETYPE_DES_CBC_NONE = KRB5_ENCTYPE_DES_CBC_NONE,
ETYPE_DES3_CBC_NONE = KRB5_ENCTYPE_DES3_CBC_NONE,
ETYPE_DES_CFB64_NONE = KRB5_ENCTYPE_DES_CFB64_NONE,
ETYPE_DES_PCBC_NONE = KRB5_ENCTYPE_DES_PCBC_NONE,
ETYPE_DIGEST_MD5_NONE = KRB5_ENCTYPE_DIGEST_MD5_NONE,
ETYPE_CRAM_MD5_NONE = KRB5_ENCTYPE_CRAM_MD5_NONE
}; };
typedef PADATA_TYPE krb5_preauthtype; typedef PADATA_TYPE krb5_preauthtype;