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

diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 0567565d33987962bc84a0d119d0c3ab0c28cf35..3f8b593e752cd4bfc521a1824c3b17f585a0bd1c 100644 (file)
--- 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 e39366c4078e0b805f54416c9de526f03a611c21..d7822540cfb5cedc74b550993a2501026e5096b3 100644 (file)
--- 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);