Remove useless bool "upper_case_domain" parameter from ntv2_owf_gen().

The code in SMBNTLMv2encrypt_hash() should not be requesting case
changes on the domain name.

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Aug 24 21:39:42 CEST 2012 on sn-devel-104

diff --git a/libcli/auth/ntlm_check.c b/libcli/auth/ntlm_check.c
index 6263ddc73a82a2cf33a2d3b47a24ed0e7bf47cee..dc70957f4f9034f8d22c62c10c98450993174b49 100644 (file)
--- a/libcli/auth/ntlm_check.c
+++ b/libcli/auth/ntlm_check.c
@@ -121,7 +121,7 @@ static bool smb_pwd_check_ntlmv2(TALLOC_CTX *mem_ctx,
           but for NTLMv2 it is meant to contain the current time etc.
        */
 
-       if (!ntv2_owf_gen(part_passwd, user, domain, false, kr)) {
+       if (!ntv2_owf_gen(part_passwd, user, domain, kr)) {
                return false;
        }
 
@@ -190,7 +190,7 @@ static bool smb_sess_key_ntlmv2(TALLOC_CTX *mem_ctx,
 
        client_key_data = data_blob_talloc(mem_ctx, ntv2_response->data+16, ntv2_response->length-16);
 
-       if (!ntv2_owf_gen(part_passwd, user, domain, false, kr)) {
+       if (!ntv2_owf_gen(part_passwd, user, domain, kr)) {
                return false;
        }
 

diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
index 3d054742172ab57641c2f995ef357e62e9682e80..37c87b4a74f9a5cba1387f75a400238e55d3822c 100644 (file)
--- a/libcli/auth/proto.h
+++ b/libcli/auth/proto.h
@@ -109,7 +109,6 @@ bool E_deshash(const char *passwd, uint8_t p16[16]);
 void nt_lm_owf_gen(const char *pwd, uint8_t nt_p16[16], uint8_t p16[16]);
 bool ntv2_owf_gen(const uint8_t owf[16],
                  const char *user_in, const char *domain_in,
-                 bool upper_case_domain, /* Transform the domain into UPPER case */
                  uint8_t kr_buf[16]);
 void SMBOWFencrypt(const uint8_t passwd[16], const uint8_t *c8, uint8_t p24[24]);
 void SMBNTencrypt_hash(const uint8_t nt_hash[16], const uint8_t *c8, uint8_t *p24);

diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
index 37d567218fbf541ef4bb00b6472b6a3d7d95af3f..372ef013b289d7e3f351944dc4b318b5c68c545d 100644 (file)
--- a/libcli/auth/smbencrypt.c
+++ b/libcli/auth/smbencrypt.c
@@ -185,7 +185,6 @@ void nt_lm_owf_gen(const char *pwd, uint8_t nt_p16[16], uint8_t p16[16])
 /* Does both the NTLMv2 owfs of a user's password */
 bool ntv2_owf_gen(const uint8_t owf[16],
                  const char *user_in, const char *domain_in,
-                 bool upper_case_domain, /* Transform the domain into UPPER case */
                  uint8_t kr_buf[16])
 {
        smb_ucs2_t *user;
@@ -215,14 +214,6 @@ bool ntv2_owf_gen(const uint8_t owf[16],
                return false;
        }
 
-       if (upper_case_domain) {
-               domain_in = strupper_talloc(mem_ctx, domain_in);
-               if (domain_in == NULL) {
-                       talloc_free(mem_ctx);
-                       return false;
-               }
-       }
-
        ret = push_ucs2_talloc(mem_ctx, &user, user_in, &user_byte_len );
        if (!ret) {
                DEBUG(0, ("push_uss2_talloc() for user failed)\n"));
@@ -498,7 +489,7 @@ bool SMBNTLMv2encrypt_hash(TALLOC_CTX *mem_ctx,
           the username and domain.
           This prevents username swapping during the auth exchange
        */
-       if (!ntv2_owf_gen(nt_hash, user, domain, true, ntlm_v2_hash)) {
+       if (!ntv2_owf_gen(nt_hash, user, domain, ntlm_v2_hash)) {
                return false;
        }