From patchwork Thu Mar 20 20:27:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirish Pargaonkar X-Patchwork-Id: 3867821 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D6C869F388 for ; Thu, 20 Mar 2014 20:27:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16149201FD for ; Thu, 20 Mar 2014 20:27:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10C27201FB for ; Thu, 20 Mar 2014 20:27:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759862AbaCTU1Q (ORCPT ); Thu, 20 Mar 2014 16:27:16 -0400 Received: from mail-oa0-f50.google.com ([209.85.219.50]:59717 "EHLO mail-oa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759851AbaCTU1P (ORCPT ); Thu, 20 Mar 2014 16:27:15 -0400 Received: by mail-oa0-f50.google.com with SMTP id i7so1545592oag.23 for ; Thu, 20 Mar 2014 13:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=M9yVyNvDEIxglTX2OdVU34SHOdbGSdgvjK0C3nFCzjU=; b=esNWofpA3Pr0VtsNgCRFO9BftcU5V06xZ+uoz3gXT/DRApzswmA9KOarXV6ZGXfiBR OhTRi+QIzOz1xOCJhf6+3FRC6+2WxLrRFlQAiIbkotDuoz0SeyBalnoGMlzMp0ArX0yd eMnzMNfh4GHpSqTtyt6JYJLv48ZZFXfGc9ovngjyDOnp8xToRVsV348+9TcaQo8xgX4V jhwclzbqS3k/zn6gN1LDMeYqWR7y7xh4MZ0Gi1+ZYkMCGHTmgwDJZeTqLBxbB0q5O1SS xvAiDpVcau7N91/vHWUxAx3OE5xyDKV5k4DVUYMtTvtDPKam3s4hQNsXpUCuvzIBqAa2 2ODQ== X-Received: by 10.182.204.41 with SMTP id kv9mr3026960obc.78.1395347234676; Thu, 20 Mar 2014 13:27:14 -0700 (PDT) Received: from shirish-ThinkPad-T400.gns.novell.com (75-13-85-90.lightspeed.austtx.sbcglobal.net. [75.13.85.90]) by mx.google.com with ESMTPSA id x3sm11806400oek.3.2014.03.20.13.27.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 13:27:13 -0700 (PDT) From: shirishpargaonkar@gmail.com To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, greearb@candelatech.com, Shirish Pargaonkar Subject: [PATCH v2] cifs: Stop using NTLMSSP flag bit NTLMSSP_NEGOTIATE_EXTENDED_SEC for key exchange Date: Thu, 20 Mar 2014 15:27:06 -0500 Message-Id: <1395347226-9184-1-git-send-email-spargaonkar@suse.com> X-Mailer: git-send-email 1.8.3.2 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Shirish Pargaonkar Send EncryptedRandomSessionKey in an Authenticate message of NTLMSSP exchange based only on whether server set flag bit NTLMSSP_NEGOTIATE_KEY_EXCH in the Challenge message of the NTLMSSP exchange. This is per section of MS-NLMP. 3.1.5.1.2 Client Receives a CHALLENGE_MESSAGE from the Server Reported-by: Ben Greear Signed-off-by: Shirish Pargaonkar --- fs/cifs/sess.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index e87387d..1bd6f4f 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -450,8 +450,7 @@ int build_ntlmssp_auth_blob(unsigned char *pbuffer, sec_blob->WorkstationName.MaximumLength = 0; tmp += 2; - if (((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) || - (ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_EXTENDED_SEC)) + if ((ses->ntlmssp->server_flags & NTLMSSP_NEGOTIATE_KEY_XCH) && !calc_seckey(ses)) { memcpy(tmp, ses->ntlmssp->ciphertext, CIFS_CPHTXT_SIZE); sec_blob->SessionKey.BufferOffset = cpu_to_le32(tmp - pbuffer);