Changeset 746 for vendor/current/libcli/auth/smbencrypt.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/libcli/auth/smbencrypt.c (modified) (7 diffs)

vendor/current/libcli/auth/smbencrypt.c

@@ -100 +100 @@
 void E_md5hash(const uint8_t salt[16], const uint8_t nthash[16], uint8_t hash_out[16])
 {
-        struct MD5Context tctx;
+        MD5_CTX tctx;
         MD5Init(&tctx);
         MD5Update(&tctx, salt, 16);
@@ -169 +169 @@
 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])
 {
@@ -197 +196 @@
                 talloc_free(mem_ctx);
                 return false;
-        }
-
-        if (upper_case_domain) {
-                domain_in = strupper_talloc(mem_ctx, domain_in);
-                if (domain_in == NULL) {
-                        talloc_free(mem_ctx);
-                        return false;
-                }
         }
 
@@ -475 +466 @@
            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;
         }
@@ -624 +615 @@
 void encode_or_decode_arc4_passwd_buffer(unsigned char pw_buf[532], const DATA_BLOB *psession_key)
 {
-        struct MD5Context tctx;
+        MD5_CTX tctx;
         unsigned char key_out[16];
 
@@ -704 +695 @@
 {
         uint8_t buffer[516];
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         struct wkssvc_PasswordBuffer *my_pwd_buf = NULL;
         DATA_BLOB confounded_session_key;
@@ -742 +733 @@
 {
         uint8_t buffer[516];
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         size_t pwd_len;