[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-433-gba2a544

Günther Deschner gd at samba.org
Mon Dec 3 13:07:25 GMT 2007


The branch, v3-2-test has been updated
       via  ba2a544baf1e1cc3652512ed5df2bb408fa8bdfd (commit)
      from  1d615e3ac397106f47c51ace36c01a8f6e1d5d13 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit ba2a544baf1e1cc3652512ed5df2bb408fa8bdfd
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 3 14:06:22 2007 +0100

    Add decode_wkssvc_join_password_buffer().
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/libsmb/smbencrypt.c |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/smbencrypt.c b/source/libsmb/smbencrypt.c
index 6060669..8793fdc 100644
--- a/source/libsmb/smbencrypt.c
+++ b/source/libsmb/smbencrypt.c
@@ -730,3 +730,32 @@ void encode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
 
 	data_blob_free(&confounded_session_key);
 }
+
+void decode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
+					struct wkssvc_PasswordBuffer *pwd_buf,
+					DATA_BLOB *session_key,
+					char **pwd)
+{
+	uint8_t buffer[516];
+	struct MD5Context ctx;
+	uint32_t pwd_len;
+
+	DATA_BLOB confounded_session_key = data_blob_talloc(mem_ctx, NULL, 16);
+
+	int confounder_len = 8;
+	uint8_t confounder[8];
+
+	memcpy(&confounder, &pwd_buf->data[0], confounder_len);
+	memcpy(&buffer, &pwd_buf->data[8], 516);
+
+	MD5Init(&ctx);
+	MD5Update(&ctx, session_key->data, session_key->length);
+	MD5Update(&ctx, confounder, confounder_len);
+	MD5Final(confounded_session_key.data, &ctx);
+
+	SamOEMhashBlob(buffer, 516, &confounded_session_key);
+
+	decode_pw_buffer(mem_ctx, buffer, pwd, &pwd_len, STR_UNICODE);
+
+	data_blob_free(&confounded_session_key);
+}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list