CIFS: Enable encryption during session setup phase

In order to allow encryption on SMB connection we need to exchange
a session key and generate encryption and decryption keys.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>

1 files changed, 10 insertions, 12 deletions

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index a1118e30e7c7..dcbcc927399a 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -344,13 +344,12 @@ void build_ntlmssp_negotiate_blob(unsigned char *pbuffer,
         /* BB is NTLMV2 session security format easier to use here? */
         flags = NTLMSSP_NEGOTIATE_56 |  NTLMSSP_REQUEST_TARGET |
                 NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_UNICODE |
-                NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_EXTENDED_SEC;
-        if (ses->server->sign) {
+                NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_EXTENDED_SEC |
+                NTLMSSP_NEGOTIATE_SEAL;
+        if (ses->server->sign)
                 flags |= NTLMSSP_NEGOTIATE_SIGN;
-                if (!ses->server->session_estab ||
-                                ses->ntlmssp->sesskey_per_smbsess)
-                        flags |= NTLMSSP_NEGOTIATE_KEY_XCH;
-        }
+        if (!ses->server->session_estab || ses->ntlmssp->sesskey_per_smbsess)
+                flags |= NTLMSSP_NEGOTIATE_KEY_XCH;
 
         sec_blob->NegotiateFlags = cpu_to_le32(flags);
 
@@ -407,13 +406,12 @@ int build_ntlmssp_auth_blob(unsigned char **pbuffer,
         flags = NTLMSSP_NEGOTIATE_56 |
                 NTLMSSP_REQUEST_TARGET | NTLMSSP_NEGOTIATE_TARGET_INFO |
                 NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_UNICODE |
-                NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_EXTENDED_SEC;
-        if (ses->server->sign) {
+                NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_EXTENDED_SEC |
+                NTLMSSP_NEGOTIATE_SEAL;
+        if (ses->server->sign)
                 flags |= NTLMSSP_NEGOTIATE_SIGN;
-                if (!ses->server->session_estab ||
-                                ses->ntlmssp->sesskey_per_smbsess)
-                        flags |= NTLMSSP_NEGOTIATE_KEY_XCH;
-        }
+        if (!ses->server->session_estab || ses->ntlmssp->sesskey_per_smbsess)
+                flags |= NTLMSSP_NEGOTIATE_KEY_XCH;
 
         tmp = *pbuffer + sizeof(AUTHENTICATE_MESSAGE);
         sec_blob->NegotiateFlags = cpu_to_le32(flags);