From patchwork Mon Apr 12 04:46:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chun-Yi" X-Patchwork-Id: 419599 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AE54C43460 for ; Mon, 12 Apr 2021 04:47:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73241611C9 for ; Mon, 12 Apr 2021 04:47:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229853AbhDLEr6 (ORCPT ); Mon, 12 Apr 2021 00:47:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229659AbhDLErm (ORCPT ); Mon, 12 Apr 2021 00:47:42 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DFEFC061574; Sun, 11 Apr 2021 21:47:25 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id r13so2199553pjf.2; Sun, 11 Apr 2021 21:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7xtegNsLq1BrppoFpeV19FwALB/ET7XzOcPVqqrlNjU=; b=Lfctu7o+A9xqb9II46Z5o+fY0vnGH1zRG5xJCj5yqni311dd5kshP1rMArmpjZASbT xRK2LD4ZP8SsXHekWtqqDp63Ppz6mCYqIlscEXQXBwb1bBuMvlF9DfFkLGyf0UDaH1DQ sFV0g13zSNZ2ozn8P1L5vZeMSC7aztjA3Rt8mhkkYn9V7Ie0h2OkFbkrkFXCQraWQr3B sfKDn6nwO/VnfG219RLdJRdbg+z+Aq78zSUqxRvkWM85/JUMfdc/YHyqHkOW/JnAepDh dGfAxlHDKPuCoG7aYwrn1r0anliTJj9SnOGpD5TqFvtIxlDm/iFknFpWptDFJMZbTCWl 5uog== 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=7xtegNsLq1BrppoFpeV19FwALB/ET7XzOcPVqqrlNjU=; b=kxkYCX1lgozS1wDwwBCbIiuWsQcBm9YClR9lTMorJ8t1HtTEkmNna5CfEOKwxw5uiO nxZeGWAgE4NByUiE5VG4HPo/x0kMoPxwT4XznxpuWAx6dMPmkJx9bHeazqIEcIQzwL3Q ZbWd4GVqACbYA2cGCBNxuKXSpFTpzAmCIPAYVryDEIZXBkLt/q8i2cLk29+fsloYkXSX VamwCaKP7TOt5LKROqe246wvbxO6WSrLwSl/FrS9MjvC87hnNPJhmhCErKUI7foqTQDn W8DXmxGH49TbZmxNbssbj+wd3QPKUo2qGPdHwTM3EDOtuchEYVSnfWDt0PpQxm9CzVmC 2fuw== X-Gm-Message-State: AOAM532kjrb8W/FuIYwivDNWVBENak67n+yw85vhlP4PPh2m0AfxK20G THNuKUt7KHj9QcTqKqQ+TXw= X-Google-Smtp-Source: ABdhPJxRVbFE3Znfq6T56wikxPzhQRO6SKMSaOYeJGZnHC2C+uhUjTTswuHgzmRHzIVWdF6C8EgjUg== X-Received: by 2002:a17:902:a70f:b029:ea:d4a8:6a84 with SMTP id w15-20020a170902a70fb02900ead4a86a84mr8134560plq.42.1618202844815; Sun, 11 Apr 2021 21:47:24 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id w16sm8514851pfj.87.2021.04.11.21.47.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 21:47:24 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: David Howells Cc: Herbert Xu , "David S . Miller" , Ben Boeckel , Randy Dunlap , Malte Gell , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" Subject: [PATCH v5,1/4] X.509: Add CodeSigning extended key usage parsing Date: Mon, 12 Apr 2021 12:46:57 +0800 Message-Id: <20210412044700.31639-2-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210412044700.31639-1-jlee@suse.com> References: <20210412044700.31639-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This patch adds the logic for parsing the CodeSign extended key usage extension in X.509. The parsing result will be set to the eku flag which is carried by public key. It can be used in the PKCS#7 verification. Signed-off-by: "Lee, Chun-Yi" --- crypto/asymmetric_keys/x509_cert_parser.c | 24 ++++++++++++++++++++++++ include/crypto/public_key.h | 1 + include/linux/oid_registry.h | 5 +++++ 3 files changed, 30 insertions(+) diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c index 52c9b455fc7d..65721313b265 100644 --- a/crypto/asymmetric_keys/x509_cert_parser.c +++ b/crypto/asymmetric_keys/x509_cert_parser.c @@ -497,6 +497,8 @@ int x509_process_extension(void *context, size_t hdrlen, struct x509_parse_context *ctx = context; struct asymmetric_key_id *kid; const unsigned char *v = value; + int i = 0; + enum OID oid; pr_debug("Extension: %u\n", ctx->last_oid); @@ -526,6 +528,28 @@ int x509_process_extension(void *context, size_t hdrlen, return 0; } + if (ctx->last_oid == OID_extKeyUsage) { + if (v[0] != ((ASN1_UNIV << 6) | ASN1_CONS_BIT | ASN1_SEQ) || + v[1] != vlen - 2) + return -EBADMSG; + i += 2; + + while (i < vlen) { + /* A 10 bytes EKU OID Octet blob = + * ASN1_OID + size byte + 8 bytes OID */ + if (v[i] != ASN1_OID || v[i + 1] != 8 || (i + 10) > vlen) + return -EBADMSG; + + oid = look_up_OID(v + i + 2, v[i + 1]); + if (oid == OID_codeSigning) { + ctx->cert->pub->eku |= EKU_codeSigning; + } + i += 10; + } + pr_debug("extKeyUsage: %d\n", ctx->cert->pub->eku); + return 0; + } + return 0; } diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h index 47accec68cb0..1ccaebe2a28b 100644 --- a/include/crypto/public_key.h +++ b/include/crypto/public_key.h @@ -28,6 +28,7 @@ struct public_key { bool key_is_private; const char *id_type; const char *pkey_algo; + unsigned int eku : 9; /* Extended Key Usage (9-bit) */ }; extern void public_key_free(struct public_key *key); diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h index 4462ed2c18cd..e20e8eb53b21 100644 --- a/include/linux/oid_registry.h +++ b/include/linux/oid_registry.h @@ -113,9 +113,14 @@ enum OID { OID_SM2_with_SM3, /* 1.2.156.10197.1.501 */ OID_sm3WithRSAEncryption, /* 1.2.156.10197.1.504 */ + /* Extended key purpose OIDs [RFC 5280] */ + OID_codeSigning, /* 1.3.6.1.5.5.7.3.3 */ + OID__NR }; +#define EKU_codeSigning (1 << 2) + extern enum OID look_up_OID(const void *data, size_t datasize); extern int sprint_oid(const void *, size_t, char *, size_t); extern int sprint_OID(enum OID, char *, size_t); From patchwork Mon Apr 12 04:46:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chun-Yi" X-Patchwork-Id: 419598 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A10CC43462 for ; Mon, 12 Apr 2021 04:47:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 58D0B611C9 for ; Mon, 12 Apr 2021 04:47:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbhDLEsA (ORCPT ); Mon, 12 Apr 2021 00:48:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229669AbhDLEry (ORCPT ); Mon, 12 Apr 2021 00:47:54 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AA86C06138C; Sun, 11 Apr 2021 21:47:27 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id z22so571150plo.3; Sun, 11 Apr 2021 21:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3jn01rfak00HumWqfPS+bL637Js5LvIW2OJzeMurQFU=; b=Tp6S82dD9pXM9Yyx55JB+z0+8uYOZetlzk+865HCEy8F7ar7wxxYuBdCO3oJXYuijY q5Khbshme2wqpzLQXyGWY6Q0U+ppj9OrnEEgTqn8v24cEtrHvCuCBJyWptApiYB21YgN VBp6l3Hi5qeN3i7lEaJ25X3I/yG0LOn7KGsna2vK9kZ0MVD+lkXXKhTA24xt3JBpQhea AGlOhquaKlxGTTfCrotO3PvUvfRdFJGXlpQXvyGx+/OR9xP8/TInbOGOyJnNjZ3uBlLr gmG7xI6ISBELV/W6g0sdWIZoeLcgXfDGixfdg5EWr2vyuAThwQRCccWynb0bGXjTKCkN MWOw== 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=3jn01rfak00HumWqfPS+bL637Js5LvIW2OJzeMurQFU=; b=WzLOrmQ6hX/RhWfb228KDq7aeoH2xd8Cyyw8MQzovS7WFmn8JalBB1CrC4wyGFvBv9 mWCvEaUTTMJVyOBHMpcn+JE/f+Rk8K62AYfTiJHD91xT9CigxXtyDnbxYvc8hAQXQl7Q Fartj9j+7xSNazZH/OeCusJrkVd/DB9g1d/OIJYPTHX33Lfb5qPLf/Mwf8LiHe8vaciF KfrW1/7Q3wC+vn7+DubDc1uOrrN64T4bcne0KO8XR16XFelKeJZG9pr88344HG8nrKUx iYhuBY2CaHeoLqquSEVxo5375H39BDZJt+rBSwYrdzuQun5wpbXKVlVjuMNhFkDxeUjY 3JBw== X-Gm-Message-State: AOAM533Jl9abub12Aq3Kv3l3sZRyU1nu8s4fhHQseqxZNJzF+fcs2yA+ YWc79ms7VSma1K8j0mVkveY= X-Google-Smtp-Source: ABdhPJy1JmDyAOIvs1oMDga59BevOok18lBeV2pw3D8i+ITyMTCxltlCr3ckagmEkNsmuCJRa5cJ9w== X-Received: by 2002:a17:90a:4e0b:: with SMTP id n11mr3047568pjh.108.1618202847133; Sun, 11 Apr 2021 21:47:27 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id w16sm8514851pfj.87.2021.04.11.21.47.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 21:47:26 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: David Howells Cc: Herbert Xu , "David S . Miller" , Ben Boeckel , Randy Dunlap , Malte Gell , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" Subject: [PATCH v5, 2/4] PKCS#7: Check codeSigning EKU for kernel module and kexec pe verification Date: Mon, 12 Apr 2021 12:46:58 +0800 Message-Id: <20210412044700.31639-3-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210412044700.31639-1-jlee@suse.com> References: <20210412044700.31639-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This patch adds the logic for checking the CodeSigning extended key usage when verifying signature of kernel module or kexec PE binary in PKCS#7. Signed-off-by: "Lee, Chun-Yi" --- certs/system_keyring.c | 2 +- crypto/asymmetric_keys/Kconfig | 9 +++++++++ crypto/asymmetric_keys/pkcs7_trust.c | 37 +++++++++++++++++++++++++++++++++--- include/crypto/pkcs7.h | 3 ++- 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/certs/system_keyring.c b/certs/system_keyring.c index 4b693da488f1..c9f8bca0b0d3 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -243,7 +243,7 @@ int verify_pkcs7_message_sig(const void *data, size_t len, goto error; } } - ret = pkcs7_validate_trust(pkcs7, trusted_keys); + ret = pkcs7_validate_trust(pkcs7, trusted_keys, usage); if (ret < 0) { if (ret == -ENOKEY) pr_devel("PKCS#7 signature not signed with a trusted key\n"); diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig index 1f1f004dc757..1754812df989 100644 --- a/crypto/asymmetric_keys/Kconfig +++ b/crypto/asymmetric_keys/Kconfig @@ -96,4 +96,13 @@ config SIGNED_PE_FILE_VERIFICATION This option provides support for verifying the signature(s) on a signed PE binary. +config CHECK_CODESIGN_EKU + bool "Check codeSigning extended key usage" + depends on PKCS7_MESSAGE_PARSER=y + depends on SYSTEM_DATA_VERIFICATION + help + This option provides support for checking the codeSigning extended + key usage when verifying the signature in PKCS#7. It affects kernel + module verification and kexec PE binary verification. + endif # ASYMMETRIC_KEY_TYPE diff --git a/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c index b531df2013c4..077bfef928b6 100644 --- a/crypto/asymmetric_keys/pkcs7_trust.c +++ b/crypto/asymmetric_keys/pkcs7_trust.c @@ -16,12 +16,36 @@ #include #include "pkcs7_parser.h" +#ifdef CONFIG_CHECK_CODESIGN_EKU +static bool check_codesign_eku(struct key *key, + enum key_being_used_for usage) +{ + struct public_key *public_key = key->payload.data[asym_crypto]; + + switch (usage) { + case VERIFYING_MODULE_SIGNATURE: + case VERIFYING_KEXEC_PE_SIGNATURE: + return !!(public_key->eku & EKU_codeSigning); + default: + break; + } + return true; +} +#else +static bool check_codesign_eku(struct key *key, + enum key_being_used_for usage) +{ + return true; +} +#endif + /* * Check the trust on one PKCS#7 SignedInfo block. */ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, struct pkcs7_signed_info *sinfo, - struct key *trust_keyring) + struct key *trust_keyring, + enum key_being_used_for usage) { struct public_key_signature *sig = sinfo->sig; struct x509_certificate *x509, *last = NULL, *p; @@ -112,6 +136,12 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, return -ENOKEY; matched: + if (!check_codesign_eku(key, usage)) { + pr_warn("sinfo %u: The signer %x key is not CodeSigning\n", + sinfo->index, key_serial(key)); + key_put(key); + return -ENOKEY; + } ret = verify_signature(key, sig); key_put(key); if (ret < 0) { @@ -156,7 +186,8 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7, * May also return -ENOMEM. */ int pkcs7_validate_trust(struct pkcs7_message *pkcs7, - struct key *trust_keyring) + struct key *trust_keyring, + enum key_being_used_for usage) { struct pkcs7_signed_info *sinfo; struct x509_certificate *p; @@ -167,7 +198,7 @@ int pkcs7_validate_trust(struct pkcs7_message *pkcs7, p->seen = false; for (sinfo = pkcs7->signed_infos; sinfo; sinfo = sinfo->next) { - ret = pkcs7_validate_trust_one(pkcs7, sinfo, trust_keyring); + ret = pkcs7_validate_trust_one(pkcs7, sinfo, trust_keyring, usage); switch (ret) { case -ENOKEY: continue; diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h index 38ec7f5f9041..b3b48240ba73 100644 --- a/include/crypto/pkcs7.h +++ b/include/crypto/pkcs7.h @@ -30,7 +30,8 @@ extern int pkcs7_get_content_data(const struct pkcs7_message *pkcs7, * pkcs7_trust.c */ extern int pkcs7_validate_trust(struct pkcs7_message *pkcs7, - struct key *trust_keyring); + struct key *trust_keyring, + enum key_being_used_for usage); /* * pkcs7_verify.c From patchwork Mon Apr 12 04:46:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chun-Yi" X-Patchwork-Id: 420312 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60B00C43460 for ; Mon, 12 Apr 2021 04:47:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E03B6121E for ; Mon, 12 Apr 2021 04:47:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbhDLEsA (ORCPT ); Mon, 12 Apr 2021 00:48:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbhDLEry (ORCPT ); Mon, 12 Apr 2021 00:47:54 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3287C06138D; Sun, 11 Apr 2021 21:47:29 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id m18so3486122plc.13; Sun, 11 Apr 2021 21:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QytjAJtOx4I9dfHfggs5vaGHYdTZvLqDyfwbAQPftuk=; b=GuE+Sl+WS2gMmCgOGuM2dt5e80BA+hqdbLNtiQkE1k68LlVcCmxRzX6thukzSFd2Gi gxy5tyjXQSYcfWztAxjOk1WgmYjw+MCtVXrDakIbfpxCkcBu+dEptJPeXlgGJK/Zd9fC bcdMB1/5rzTXX2HaMIkGNowYwEF/NWSrabPyxwYM4m7lOzZUMQzSxBnmCwlisJvoNQvm 1Xj51/NE9zUlIDKCmUnpw0crphOpzX/jFpd20opQT/U21X0+432dRsSOaT8FyBvGB5Fs +/AKnnUV9K5lounVNtUNxK+7GCFLlRenqD438/OfIz3shmOb8XswXJAgwcDhAYJtgfnO Y9pQ== 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=QytjAJtOx4I9dfHfggs5vaGHYdTZvLqDyfwbAQPftuk=; b=LSjbkeNt0FbAsFqJJlVBCfffEueQhX83BgAFaXvJq5eSBZT6wxBqh9WBLWNaSRB1G/ sSXW/MBywoRjlLbm75mVG06OZJJnaA533Hv1eEgqreqP4elfvbYUfTbvGSc/UAwk6K9t hkb3zJrFiREoFVTai0spQg6VLRu1AApxOIeR+Ww8SFhQAca9tbBt8VNTQBvZ+E53CVGB x0O48WYVeZI1KT/Fn9CNH+QMPn+IlOFtUpQvbI5aQLDZpAaIPYjZbI4ODXxrEL87VMPX vvkpayfXCnvnIcPnbgqOyXQbw5Ej+HfvX7bPLhu0s1cI4BfjIigKfRnWLlVLqUKYWN5k vtUg== X-Gm-Message-State: AOAM532jTN7DPHCkBtInV2mA/JpYS74mx7vvfHNk2ynT0ZLPHmnC3lqW t/ypGGlH8PWs9No0SedkmaA= X-Google-Smtp-Source: ABdhPJyrmGvNbhPsqGTrMvJ65dXOvQTy2hsfRsofNgfAfPi/k2h3Yvi3Map/UhC8Kq3mM0zUqbq8kQ== X-Received: by 2002:a17:902:aa87:b029:e9:8d9e:6808 with SMTP id d7-20020a170902aa87b02900e98d9e6808mr19763529plr.34.1618202849280; Sun, 11 Apr 2021 21:47:29 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id w16sm8514851pfj.87.2021.04.11.21.47.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 21:47:28 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: David Howells Cc: Herbert Xu , "David S . Miller" , Ben Boeckel , Randy Dunlap , Malte Gell , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" Subject: [PATCH v5, 3/4] modsign: Add codeSigning EKU when generating X.509 key generation config Date: Mon, 12 Apr 2021 12:46:59 +0800 Message-Id: <20210412044700.31639-4-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210412044700.31639-1-jlee@suse.com> References: <20210412044700.31639-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Add codeSigning EKU to the X.509 key generation config for the build time autogenerated kernel key. Signed-off-by: "Lee, Chun-Yi" --- certs/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/certs/Makefile b/certs/Makefile index f4c25b67aad9..1ef4d6ca43b7 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -88,6 +88,7 @@ $(obj)/x509.genkey: @echo >>$@ "keyUsage=digitalSignature" @echo >>$@ "subjectKeyIdentifier=hash" @echo >>$@ "authorityKeyIdentifier=keyid" + @echo >>$@ "extendedKeyUsage=codeSigning" endif # CONFIG_MODULE_SIG_KEY $(eval $(call config_filename,MODULE_SIG_KEY)) From patchwork Mon Apr 12 04:47:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chun-Yi" X-Patchwork-Id: 420311 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9230AC43461 for ; Mon, 12 Apr 2021 04:47:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 807A761260 for ; Mon, 12 Apr 2021 04:47:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229810AbhDLEsB (ORCPT ); Mon, 12 Apr 2021 00:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229676AbhDLEry (ORCPT ); Mon, 12 Apr 2021 00:47:54 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 192D6C06138E; Sun, 11 Apr 2021 21:47:32 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id s14so1142366pjl.5; Sun, 11 Apr 2021 21:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wB1I6Nqq7AfdRuGhioLL2RWvT/EvSUrtBmeOoGNpC4c=; b=eEhL3hkNO0dsytCFG6zTFp3q3lxZbPWEmVGMllP6dUV8HcqGx/OWRVTRxyHRwyV4BN +rBgX6ATm6BkVrGXBa6YeEjNfxIETKD5dNXmZmrVu98cteQzzZ0YA9IQi1x9IaAZn6c+ 3NvmBn7vnteCNIl5cwubSYUc8042QxymMCErGiDZxxZZ/7TjyFd14OM01FTlwLqzIBbh U0YVkcIwSt6W6GznUNU54V37nv8565TDGykCtzth4G2vUKRs8dOmXJw5lPQCVB+6AOtL grcPM9qiYtIF8PSn717XJ8PnVX6VWJSxUNIO9TYgSxBQFC++pWs4Khw9TPKR26rxLqp2 CDTQ== 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=wB1I6Nqq7AfdRuGhioLL2RWvT/EvSUrtBmeOoGNpC4c=; b=ALlgI/7UDIomOYKUx744rlPLSPOYMlkbiGCKeDqSmjlAVIWL5o6gZiG0Kzm//6YBGX 4+VjjEQ1zy1feQFmwRNtQS3yhi0EcwqaPaawTsD/LCwtZ2p8Z6ddA/A5dmQILWeBVwfG 8rnQlWxR9n79V9LeFtT6CtjZbLXn+EIEOUJMFthvRnSRwTS5aeQwMqcwxrvYNZj11Ppv wpzJY+YlH3PhTPoItr96adrlV+kC4PJ9UPmNNDuaoAW/ZsDvIH32/nTB90h5gIvONYEk 8waC+gFSRMCgdw27fA6zR74BjMXbSs2c0AGyvS9BIklB0qxnTConxc56SGOiwDOlCN8g IjFg== X-Gm-Message-State: AOAM533rxUHBMRBvpUwDEyhynCnXf0qKLi/FDcsQJONhIfOvEfQFhB2Q Hb9NgX7N1N3TdZXQ3y+NuWU= X-Google-Smtp-Source: ABdhPJx+ejPnjpbm12qIZRhqEXS0YzVZ4ga5UBZTMoWcrmY01h3TJRr3cysHuvF0uzK2msXo8dHVvg== X-Received: by 2002:a17:902:ac89:b029:e6:d199:29ac with SMTP id h9-20020a170902ac89b02900e6d19929acmr24507684plr.46.1618202851663; Sun, 11 Apr 2021 21:47:31 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id w16sm8514851pfj.87.2021.04.11.21.47.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Apr 2021 21:47:31 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: David Howells Cc: Herbert Xu , "David S . Miller" , Ben Boeckel , Randy Dunlap , Malte Gell , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" Subject: [PATCH v5, 4/4] Documentation/admin-guide/module-signing.rst: add openssl command option example for CodeSign EKU Date: Mon, 12 Apr 2021 12:47:00 +0800 Message-Id: <20210412044700.31639-5-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210412044700.31639-1-jlee@suse.com> References: <20210412044700.31639-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Add an openssl command option example for generating CodeSign extended key usage in X.509 when CONFIG_CHECK_CODESIGN_EKU is enabled. Signed-off-by: "Lee, Chun-Yi" --- Documentation/admin-guide/module-signing.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/admin-guide/module-signing.rst b/Documentation/admin-guide/module-signing.rst index 7d7c7c8a545c..ca3b8f19466c 100644 --- a/Documentation/admin-guide/module-signing.rst +++ b/Documentation/admin-guide/module-signing.rst @@ -170,6 +170,12 @@ generate the public/private key files:: -config x509.genkey -outform PEM -out kernel_key.pem \ -keyout kernel_key.pem +When ``CONFIG_CHECK_CODESIGN_EKU`` option is enabled, the following openssl +command option should be added where for generating CodeSign extended key usage +in X.509:: + + -addext "extendedKeyUsage=codeSigning" + The full pathname for the resulting kernel_key.pem file can then be specified in the ``CONFIG_MODULE_SIG_KEY`` option, and the certificate and key therein will be used instead of an autogenerated keypair.