sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

lib/krb5_wrap: Move kerberos_enctype_to_bitmap() into krb5_wrap

Browse Source
This commit is contained in:
Andrew Bartlett 2012-08-27 15:52:47 +10:00
parent 0f7aa3db52
commit 1ed6070570
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/krb5_wrap/krb5_samba.c
View File

@ -23,6 +23,7 @@
#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
@ -2346,6 +2347,26 @@ const krb5_enctype *samba_all_enctypes(void)
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,

2
lib/krb5_wrap/krb5_samba.h
View File

@ -295,6 +295,8 @@ krb5_boolean smb_krb5_kt_compare(krb5_context context,
const krb5_enctype *samba_all_enctypes(void);
uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum);
#endif /* HAVE_KRB5 */
int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,

20
source4/kdc/db-glue.c
View File

@ -67,26 +67,6 @@ static const char *trust_attrs[] = {
};
/* Translate between the IETF encryption type values and the Microsoft
* msDS-SupportedEncryptionTypes values */
static 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;
}
}
static KerberosTime ldb_msg_find_krb5time_ldap_time(struct ldb_message *msg, const char *attr, KerberosTime default_val)
{
const char *tmp;