From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 8 Aug 2012 07:32:22 +0000 (+0200)
Subject: s3:smb2_sesssetup: setup global->[en|de]cryption_key
X-Git-Tag: ldb-1.1.10~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d7b17f4db9d271ae41ade7c7b003b8d264cf6bf;p=thirdparty%2Fsamba.git

s3:smb2_sesssetup: setup global->[en|de]cryption_key

metze

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Aug  9 09:59:02 CEST 2012 on sn-devel-104
---

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 6135efcd547..12a9d22f169 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -243,6 +243,42 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session,
 				    x->global->signing_key.data);
 	}
 
+	if (conn->protocol >= PROTOCOL_SMB2_24) {
+		const DATA_BLOB label = data_blob_string_const_null("SMB2AESCCM");
+		const DATA_BLOB context = data_blob_string_const_null("ServerIn ");
+
+		x->global->decryption_key = data_blob_talloc(x->global,
+							     session_key,
+							     sizeof(session_key));
+		if (x->global->decryption_key.data == NULL) {
+			ZERO_STRUCT(session_key);
+			return NT_STATUS_NO_MEMORY;
+		}
+
+		smb2_key_derivation(session_key, sizeof(session_key),
+				    label.data, label.length,
+				    context.data, context.length,
+				    x->global->decryption_key.data);
+	}
+
+	if (conn->protocol >= PROTOCOL_SMB2_24) {
+		const DATA_BLOB label = data_blob_string_const_null("SMB2AESCCM");
+		const DATA_BLOB context = data_blob_string_const_null("ServerOut");
+
+		x->global->encryption_key = data_blob_talloc(x->global,
+							     session_key,
+							     sizeof(session_key));
+		if (x->global->encryption_key.data == NULL) {
+			ZERO_STRUCT(session_key);
+			return NT_STATUS_NO_MEMORY;
+		}
+
+		smb2_key_derivation(session_key, sizeof(session_key),
+				    label.data, label.length,
+				    context.data, context.length,
+				    x->global->encryption_key.data);
+	}
+
 	x->global->application_key = data_blob_dup_talloc(x->global,
 						x->global->signing_key);
 	if (x->global->application_key.data == NULL) {