From 81aa7f506c052a62792fe093a7dc947420835830 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 4 Mar 2001 02:13:14 +0000 Subject: [PATCH] (krb5_enctype): add ENCTYPE_* aliases for compatibility with MIT krb5 git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9730 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/krb5.h | 56 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index c0d82dac3..0922a64f7 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -71,24 +71,42 @@ typedef struct krb5_crypto_data *krb5_crypto; typedef CKSUMTYPE krb5_cksumtype; typedef enum krb5_enctype { - ETYPE_NULL = 0, - ETYPE_DES_CBC_CRC = 1, - ETYPE_DES_CBC_MD4 = 2, - ETYPE_DES_CBC_MD5 = 3, - ETYPE_DES3_CBC_MD5 = 5, - ETYPE_OLD_DES3_CBC_SHA1 = 7, - ETYPE_SIGN_DSA_GENERATE = 8, - ETYPE_ENCRYPT_RSA_PRIV = 9, - ETYPE_ENCRYPT_RSA_PUB = 10, - ETYPE_DES3_CBC_SHA1 = 16, /* with key derivation */ - ETYPE_ARCFOUR_HMAC_MD5 = 23, - ETYPE_ARCFOUR_HMAC_MD5_56 = 24, - ETYPE_ENCTYPE_PK_CROSS = 48, - ETYPE_DES_CBC_NONE = -0x1000, - ETYPE_DES3_CBC_NONE = -0x1001, - ETYPE_DES_CFB64_NONE = -0x1002, - ETYPE_DES_PCBC_NONE = -0x1003, - ETYPE_DES3_CBC_NONE_IVEC = -0x1004 + ETYPE_NULL = 0, + ENCTYPE_NULL = ETYPE_NULL, + ETYPE_DES_CBC_CRC = 1, + ENCTYPE_DES_CBC_CRC = ETYPE_DES_CBC_CRC, + ETYPE_DES_CBC_MD4 = 2, + ENCTYPE_DES_CBC_MD4 = ETYPE_DES_CBC_MD4, + ETYPE_DES_CBC_MD5 = 3, + ENCTYPE_DES_CBC_MD5 = ETYPE_DES_CBC_MD5, + ETYPE_DES3_CBC_MD5 = 5, + ENCTYPE_DES3_CBC_MD5 = ETYPE_DES3_CBC_MD5, + ETYPE_OLD_DES3_CBC_SHA1 = 7, + ENCTYPE_OLD_DES3_CBC_SHA1 = ETYPE_OLD_DES3_CBC_SHA1, + ETYPE_SIGN_DSA_GENERATE = 8, + ENCTYPE_SIGN_DSA_GENERATE = ETYPE_SIGN_DSA_GENERATE, + ETYPE_ENCRYPT_RSA_PRIV = 9, + ENCTYPE_ENCRYPT_RSA_PRIV = ETYPE_ENCRYPT_RSA_PRIV, + ETYPE_ENCRYPT_RSA_PUB = 10, + ENCTYPE_ENCRYPT_RSA_PUB = ETYPE_ENCRYPT_RSA_PUB, + ETYPE_DES3_CBC_SHA1 = 16, /* with key derivation */ + ENCTYPE_DES3_CBC_SHA1 = ETYPE_DES3_CBC_SHA1, + ETYPE_ARCFOUR_HMAC_MD5 = 23, + ENCTYPE_ARCFOUR_HMAC_MD5 = ETYPE_ARCFOUR_HMAC_MD5, + ETYPE_ARCFOUR_HMAC_MD5_56 = 24, + ENCTYPE_ARCFOUR_HMAC_MD5_56 = ETYPE_ARCFOUR_HMAC_MD5_56, + ETYPE_ENCTYPE_PK_CROSS = 48, + ENCTYPE_ENCTYPE_PK_CROSS = ETYPE_ENCTYPE_PK_CROSS, + ETYPE_DES_CBC_NONE = -0x1000, + ENCTYPE_DES_CBC_NONE = ETYPE_DES_CBC_NONE, + ETYPE_DES3_CBC_NONE = -0x1001, + ENCTYPE_DES3_CBC_NONE = ETYPE_DES3_CBC_NONE, + ETYPE_DES_CFB64_NONE = -0x1002, + ENCTYPE_DES_CFB64_NONE = ETYPE_DES_CFB64_NONE, + ETYPE_DES_PCBC_NONE = -0x1003, + ENCTYPE_DES_PCBC_NONE = ETYPE_DES_PCBC_NONE, + ETYPE_DES3_CBC_NONE_IVEC = -0x1004, + ENCTYPE_DES3_CBC_NONE_IVEC = ETYPE_DES3_CBC_NONE_IVEC, } krb5_enctype; typedef PADATA_TYPE krb5_preauthtype;