summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-08-18 12:08:37 +1000
committerAndrew Bartlett <abartlet@samba.org>2009-08-21 17:50:49 +1000
commit29ef1b2325ac5b80a52abfbd30346636695f4247 (patch)
tree879068a26b8eff3429d69f04844c56b3f4306938
parent9b261a1211de2bfef22af64d4717b44c5ed2bfb8 (diff)
downloadsamba-29ef1b2325ac5b80a52abfbd30346636695f4247.tar.gz
samba-29ef1b2325ac5b80a52abfbd30346636695f4247.tar.bz2
samba-29ef1b2325ac5b80a52abfbd30346636695f4247.zip
s4:kerberos Use MIT compatible names for these enc types
This is a small start on (ie, the only trivial part of) the work shown in: http://k5wiki.kerberos.org/wiki/Projects/Samba4_Port#Samba.27s_use_of_Heimdal_symbols.2C_with_MIT_differences (a table of all Kerberos symbols used in Samba4, and notes on where they differ from those provided with MIT Kerberos) Andrew Bartlett
-rw-r--r--source4/auth/kerberos/kerberos_util.c2
-rw-r--r--source4/kdc/hdb-samba4.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 0567565d33..3f8b593e75 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -184,7 +184,7 @@ static krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx,
return EINVAL;
}
ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
- ETYPE_ARCFOUR_HMAC_MD5,
+ ENCTYPE_ARCFOUR_HMAC,
mach_pwd->hash, sizeof(mach_pwd->hash),
&keyblock);
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index e39366c407..d7822540cf 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -333,7 +333,7 @@ static krb5_error_code hdb_samba4_message2entry_keys(krb5_context context,
key.salt = NULL; /* No salt for this enc type */
ret = krb5_keyblock_init(context,
- ENCTYPE_ARCFOUR_HMAC_MD5,
+ ENCTYPE_ARCFOUR_HMAC,
hash->hash, sizeof(hash->hash),
&key.key);
if (ret) {
@@ -839,7 +839,7 @@ static krb5_error_code hdb_samba4_trust_message2entry(krb5_context context, HDB
}
ret = krb5_keyblock_init(context,
- ENCTYPE_ARCFOUR_HMAC_MD5,
+ ENCTYPE_ARCFOUR_HMAC,
password_hash.hash, sizeof(password_hash.hash),
&key.key);