diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-27 18:34:02 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-28 07:57:29 +1000 |
| commit | 62373b8a509fb874728c351e8039f94e3a1dd6db (patch) | |
| tree | a301da4e3ab299dba43806f8b2919a6c603b4ad0 /lib/krb5_wrap/krb5_samba.c | |
| parent | d5b9972215071d3d09b586fcc371c69002f89192 (diff) | |
| download | samba-62373b8a509fb874728c351e8039f94e3a1dd6db.tar.gz samba-62373b8a509fb874728c351e8039f94e3a1dd6db.tar.bz2 samba-62373b8a509fb874728c351e8039f94e3a1dd6db.zip | |
lib/krb5_wrap: Move enctype conversion functions into a simple helper file
Diffstat (limited to 'lib/krb5_wrap/krb5_samba.c')
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 171908aecc..2d237ffa12 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -23,7 +23,6 @@ #include "includes.h" #include "krb5_samba.h" #include "lib/util/asn1.h" -#include "librpc/gen_ndr/netlogon.h" #ifndef KRB5_AUTHDATA_WIN2K_PAC #define KRB5_AUTHDATA_WIN2K_PAC 128 @@ -2333,40 +2332,6 @@ char *smb_get_krb5_error_message(krb5_context context, return ret; } -const krb5_enctype *samba_all_enctypes(void) -{ - /* TODO: Find a way not to have to use a fixed list */ - static const krb5_enctype enctypes[] = { - KRB5_ENCTYPE_DES_CBC_CRC, - KRB5_ENCTYPE_DES_CBC_MD5, - KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96, - KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96, - KRB5_ENCTYPE_ARCFOUR_HMAC_MD5, - 0 - }; - return enctypes; -}; - -/* Translate between the IETF encryption type values and the Microsoft - * msDS-SupportedEncryptionTypes values */ -uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum) -{ - switch (enc_type_enum) { - case ENCTYPE_DES_CBC_CRC: - return ENC_CRC32; - case ENCTYPE_DES_CBC_MD5: - return ENC_RSA_MD5; - case ENCTYPE_ARCFOUR_HMAC_MD5: - return ENC_RC4_HMAC_MD5; - case ENCTYPE_AES128_CTS_HMAC_SHA1_96: - return ENC_HMAC_SHA1_96_AES128; - case ENCTYPE_AES256_CTS_HMAC_SHA1_96: - return ENC_HMAC_SHA1_96_AES256; - default: - return 0; - } -} - #else /* HAVE_KRB5 */ /* this saves a few linking headaches */ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx, |