From patchwork Sun May 2 21:00:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1472897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FYJS30f2rz9sW6; Mon, 3 May 2021 07:01:23 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ldJDK-00058p-56; Sun, 02 May 2021 21:01:18 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ldJD6-0004x7-Rg for kernel-team@lists.ubuntu.com; Sun, 02 May 2021 21:01:04 +0000 Received: from mail-pg1-f200.google.com ([209.85.215.200]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ldJD5-0005SI-Q7 for kernel-team@lists.ubuntu.com; Sun, 02 May 2021 21:01:03 +0000 Received: by mail-pg1-f200.google.com with SMTP id i8-20020a6548480000b02901fb8ebd5714so2156382pgs.12 for ; Sun, 02 May 2021 14:01:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G95Ez2hTl+t7G1JZbGKJLnRZgGt0it7ZOFrGbN3JmY4=; b=BQO0WG/nJsxCgQSLFBOb4j74rhzZoUIZQ3H/T1AsNhMO7+ZzbWVdJGhWmxeiRspgb9 HdKPkikAAQANQVr4xL0ztDcvwkpI4yOPQd8U8gu2zcjm5GLYqNBUeCDm6e1oNABe7cvl LkhJscESo3SwlgZGidafn6+fBt8Ew7iDezTGCsC1DFqg+XIENpEnDyChPcwAqcmFEcyu M/Ayrv/EdalHSGatHlAtAbC2t1DMu09ubC9e3haJ3tPt1SnRkQblyM4pdw3K5YhcsDCR HAJ2Ab/mVa62hRT+yZqw82SyXKqpjJZV8BcwBKTG7DbI1Vr8ji65Hz8uVZK0HO98Cwju 8vjw== X-Gm-Message-State: AOAM533R5aUQHZxd6h5X2wI3I3mR7OdpnzwwgwkDYrlevsBjrB8nDmbZ wVufhEATa3HfmyfZsvj0D6n4xbVWq5uIj0xc7D6FpVel0QY3kCcCruCuC0jrNk/5PMlU0KfXaYv AlgBF+Rhb2y9LkCvTGw1PXc6RuHkkUL/Owo7yX02nhA== X-Received: by 2002:a05:6a00:7c9:b029:28e:9a2a:8da3 with SMTP id n9-20020a056a0007c9b029028e9a2a8da3mr1984945pfu.60.1619989262185; Sun, 02 May 2021 14:01:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAullkRT+lRBmPOk530Sg3Vh2AnV39h9k4DKb/bxRSynETwEMbklkq9f/95pBkg51Q/mbSiw== X-Received: by 2002:a05:6a00:7c9:b029:28e:9a2a:8da3 with SMTP id n9-20020a056a0007c9b029028e9a2a8da3mr1984931pfu.60.1619989261996; Sun, 02 May 2021 14:01:01 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id y3sm7344209pjr.40.2021.05.02.14.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 14:01:01 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [Groovy][PATCH 1/7] smb3: add defines for new crypto algorithms Date: Sun, 2 May 2021 15:00:34 -0600 Message-Id: <20210502210040.18628-9-tim.gardner@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210502210040.18628-1-tim.gardner@canonical.com> References: <20210502210040.18628-1-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Steve French BugLink: https://bugs.launchpad.net/bugs/1921916 In encryption capabilities negotiate context can now request AES256 GCM or CCM Signed-off-by: Steve French Acked-by: Ronnie Sahlberg (cherry picked from commit 119e489681f769e497637da16d5df530213f5720) Signed-off-by: Tim Gardner --- fs/cifs/smb2pdu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index 64ec079f40d0..aa7ebb4b6a37 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -333,6 +333,8 @@ struct smb2_preauth_neg_context { /* Encryption Algorithms Ciphers */ #define SMB2_ENCRYPTION_AES128_CCM cpu_to_le16(0x0001) #define SMB2_ENCRYPTION_AES128_GCM cpu_to_le16(0x0002) +#define SMB2_ENCRYPTION_AES256_CCM cpu_to_le16(0x0003) +#define SMB2_ENCRYPTION_AES256_GCM cpu_to_le16(0x0004) /* Min encrypt context data is one cipher so 2 bytes + 2 byte count field */ #define MIN_ENCRYPT_CTXT_DATA_LEN 4