Attachment 3205 Details for Bug 5349 – Attempted patch - shortens session key to 16 bytes

[patch] Attempted patch - shortens session key to 16 bytes

session_key.patch (text/plain), 1.55 KB, created by Andrew Bartlett on 2008-03-24 23:57:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2008-03-24 23:57:54 UTC

Size: 1.55 KB

patch

obsolete

>diff --git a/source/libcli/raw/smb_signing.c b/source/libcli/raw/smb_signing.c
>index 4acfb9d..1bc93cb 100644
>--- a/source/libcli/raw/smb_signing.c
>+++ b/source/libcli/raw/smb_signing.c
>@@ -329,6 +329,8 @@ bool smbcli_simple_set_signing(TALLOC_CTX *mem_ctx,
> 			       const DATA_BLOB *user_session_key, 
> 			       const DATA_BLOB *response)
> {
>+	size_t user_session_key_length;
>+	user_session_key_length = MAX(user_session_key->length, 16);
> 	if (sign_info->mandatory_signing) {
> 		DEBUG(5, ("Mandatory SMB signing enabled!\n"));
> 	}
>@@ -336,15 +338,15 @@ bool smbcli_simple_set_signing(TALLOC_CTX *mem_ctx,
> 	DEBUG(5, ("SMB signing enabled!\n"));
> 
> 	if (response && response->length) {
>-		sign_info->mac_key = data_blob_talloc(mem_ctx, NULL, response->length + user_session_key->length);
>+		sign_info->mac_key = data_blob_talloc(mem_ctx, NULL, response->length + user_session_key_length);
> 	} else {
>-		sign_info->mac_key = data_blob_talloc(mem_ctx, NULL, user_session_key->length);
>+		sign_info->mac_key = data_blob_talloc(mem_ctx, NULL, user_session_key_length);
> 	}
> 		
>-	memcpy(&sign_info->mac_key.data[0], user_session_key->data, user_session_key->length);
>+	memcpy(&sign_info->mac_key.data[0], user_session_key->data, user_session_key_length);
> 
> 	if (response && response->length) {
>-		memcpy(&sign_info->mac_key.data[user_session_key->length],response->data, response->length);
>+		memcpy(&sign_info->mac_key.data[user_session_key_length],response->data, response->length);
> 	}
> 
> 	dump_data_pw("Started Signing with key:\n", sign_info->mac_key.data, sign_info->mac_key.length);

Actions: View

Attachments on bug 5349: 3200 | 3201 | 3202 | 3203 | 3204 | 3205 | 3213 | 3214