From patchwork Mon Feb 22 06:42:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 12097971 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.7 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,URIBL_BLOCKED,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 4E203C433E9 for ; Mon, 22 Feb 2021 06:44:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 003E764E44 for ; Mon, 22 Feb 2021 06:44:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbhBVGoA (ORCPT ); Mon, 22 Feb 2021 01:44:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229934AbhBVGn6 (ORCPT ); Mon, 22 Feb 2021 01:43:58 -0500 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46EAEC061786; Sun, 21 Feb 2021 22:43:18 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id m2so9657279pgq.5; Sun, 21 Feb 2021 22:43:18 -0800 (PST) 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=Fk1XjhsIVpehEyUHjISdm6QYmnqvAVbB3cg/2P5Gk18=; b=TnR9u2+aykQXhdo9+dW3P6LSbs8rvYWZQ/wVW/56L8JCWVL8xCw22mArldeX9EcUiE hEDUYlWlb1Q10frj13VVCQZqYM06Ki1CahB5y4qC0U3fP9Sxu/gRXEFNTI8uOjrzd6aX akaghn8BHcNn4PbXdeH81AkkzPstemPkgZBMyPdFSQO8xQEMVf0Pq36ffq/fJme3QUJO Ta0qcCsr2bzJbcNpDmWnxApg8R+KbDYDglDSjpkfTeS6/mOpbTvwCxzZFBwef2gEinH3 R0f9AqM0/3jdBaYKJ+8hjW9xezkGrdQrqJ7PIS92reC+KMe41sGg3itp9swQaRn+9QWF LK3g== 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=Fk1XjhsIVpehEyUHjISdm6QYmnqvAVbB3cg/2P5Gk18=; b=JLsqJB/tH6lECQyiddOzr0TygB0Q+a7PxjMtVFcjC0wwTsO+HAG0TEV/Ug+YXsbrOW tp50+1d4X/dx+KhCuexM8GYRhuVxIV0zks/BTtyNX/PGaSQDI47lmAOHPaXrksJo972B H48Hr4LT2DlDNYHW35OIHvNr0FFiCIiL96UP1zcylcUgl9bMt5dUXeGF9n4v4X4+7Hka tOGbe2q1lOLab2qhQR03X9ZU5ASPHKYCsRgZYYRS5QLghscUdCpBQr5dnv5plG6rNndh htPKokddUkBeNIDlr5JSZRWA0cS6De0mLfHlE6bAzFP0oqOXDFK3z8bsnnSetUqZOo82 VThQ== X-Gm-Message-State: AOAM5323YqtzlU2Egbmyly3uI/1xQqh5uKU7TorWaFH8igVTOzcngeXS cjoho5Lf5VE3XiA3/z7u+fg= X-Google-Smtp-Source: ABdhPJzl1RLoPaURcKQslgBIISE2/2jNdVWWv9RaoTDJxb0lBPN57ogXFj8niz+4LWzCyJGOdtBvZA== X-Received: by 2002:a63:c4a:: with SMTP id 10mr18893205pgm.397.1613976197900; Sun, 21 Feb 2021 22:43:17 -0800 (PST) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id 188sm8688195pfz.119.2021.02.21.22.43.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Feb 2021 22:43:17 -0800 (PST) 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 1/4] X.509: Add CodeSigning extended key usage parsing Date: Mon, 22 Feb 2021 14:42:48 +0800 Message-Id: <20210222064251.13374-2-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210222064251.13374-1-jlee@suse.com> References: <20210222064251.13374-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: keyrings@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 948c5203ca9c..07a1b28460a2 100644 --- a/include/crypto/public_key.h +++ b/include/crypto/public_key.h @@ -29,6 +29,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 Feb 22 06:42:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 12097973 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.7 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,URIBL_BLOCKED,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 1B1A9C4332B for ; Mon, 22 Feb 2021 06:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B8B1364F07 for ; Mon, 22 Feb 2021 06:44:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229518AbhBVGoD (ORCPT ); Mon, 22 Feb 2021 01:44:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229959AbhBVGoB (ORCPT ); Mon, 22 Feb 2021 01:44:01 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 866D6C06178A; Sun, 21 Feb 2021 22:43:20 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id d11so2176019plo.8; Sun, 21 Feb 2021 22:43:20 -0800 (PST) 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=rEVQORojpxPILZoW25n2HNyuoMNfuJyQRA19mYILOf8=; b=JjcnAozsmY9la23DCLsqSsnm39KL6t61xA0bbOw/HvfCowA9HR1pI7/W1FhFXRDSPO WpblQT+kDHUtjEGBOsYhUPyysCEmGcf6hWwS4fsvVBxQgfLL+Brk/B10JR2cG9QXzdV1 ExZpYY9SU5N+SA1FbJIWJXmiQmw4olWFXI3Shm2Z2gtaPmaBREfY2Bg15TkFl8m4OOBj ZaDMj+wlE3Z2MQSdUPOtrCz2BL5l/Wc3IMSJAgy/etn1RiUGQDP1DcPASphn0BOjbIAM 5KC6kjQ7+vK+Rvh0/eE5zoRiOGPXPijwz7z605NCN3PhHeGMXVSJJzU2mi5wCDAEj509 d54w== 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=rEVQORojpxPILZoW25n2HNyuoMNfuJyQRA19mYILOf8=; b=Pi6Auz8mBkIVLfdKILJnvzd2bilZ11vl+GE3ZwcVSq96gBt0g7JrG3CJefd+TqZHQ3 P65XIDNWbnEqigXsn4KNpCcM1RARnGCtK3d3AaEBiA2vxu5kOhMilDOUElkZzsnh3qRl z3EJ/IbaNVvOZrBMnft6F5bCt5KwheYuaStrahORz+Qsh8/WuOq3OqPa9Bb9T9WcLVo9 OZTP/qZZmWw7Ed2gLgch0X+RDLxSunmdrljTaZ5IuHeF7bxOZM7FxBqiCQhTKK4KXheK M7gNtct0Ybm2pfdxxswVaLOhY41ldpA2arE2WPwAmk5uw8/2uDCHlabqwA6Uy50W7YAF PKpw== X-Gm-Message-State: AOAM533z05wwKLMQcfM6IC8GWJBCQwhLnd3+NFu6TA519O6MB+J5gyhD ZkjRoB++sAim50196YpxgTQ= X-Google-Smtp-Source: ABdhPJzz/PpodHGcf5l6LDBf6Jftg40JWRclkpmF7sd2QYbKT67CwE28cxPaFyPM5/cDyXpsshWUtQ== X-Received: by 2002:a17:902:7592:b029:e2:e80f:6893 with SMTP id j18-20020a1709027592b02900e2e80f6893mr21119399pll.61.1613976200103; Sun, 21 Feb 2021 22:43:20 -0800 (PST) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id 188sm8688195pfz.119.2021.02.21.22.43.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Feb 2021 22:43:19 -0800 (PST) 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 2/4] PKCS#7: Check codeSigning EKU for kernel module and kexec pe verification Date: Mon, 22 Feb 2021 14:42:49 +0800 Message-Id: <20210222064251.13374-3-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210222064251.13374-1-jlee@suse.com> References: <20210222064251.13374-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: keyrings@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 798291177186..4104f5465d8a 100644 --- a/certs/system_keyring.c +++ b/certs/system_keyring.c @@ -242,7 +242,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 61af3c4d82cc..1d2318ff63db 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 Feb 22 06:42:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 12097975 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.7 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,URIBL_BLOCKED,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 4CCA0C4332E for ; Mon, 22 Feb 2021 06:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F1E664F0B for ; Mon, 22 Feb 2021 06:44:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229989AbhBVGoF (ORCPT ); Mon, 22 Feb 2021 01:44:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229961AbhBVGoC (ORCPT ); Mon, 22 Feb 2021 01:44:02 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99C6FC06178B; Sun, 21 Feb 2021 22:43:22 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id s23so5098225pji.1; Sun, 21 Feb 2021 22:43:22 -0800 (PST) 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=PrxMyC1//1v4Rr7Cwqhz0+WFz3RLYN04Qjc6zQq2dsp1htbkY/7nR0/Gg790wCUE03 5ivZDoFJlrMvIs89EAem5x6JGdG60v8z+6mgMMf7pjeKGCvGC8p+1zeaYjLOtknUGRFj 78hTPr+kjwuPmJhWfYUvqas4XDjiKK6ZIhHRaK8evw+MbSbu6+GxegPZDqh/svVckzxL 1btxZqHf60kBXGWl/nZHi5Mw8/kx1mcSoWtOR3jEm3MBVGwGpKo4sivzdyMyL36+xkHh yNK5DORHDYcKedozze7VHX6jHujGIZb7xRN3Z47HVg1cnhjymOP5trSRUC9hz0dfgiFd LB/g== 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=kVvnQxuXYkRankH8no3HPbkm75wbl2Izg7Xc/A2M1A87ts37HvmI5gEoCqfXEiphyU fB4v/kLD6vkX4YU0H/XsDX67F2C2WPdwdGxa52uTq9FJO5em2lDpFuUct+6DbTozFgno 4JWwFtkV3/NTad7psE0iPdXKif2SNegXLtojuG/0/cMYxPre9atErzzJfOlYzVS8XbYK dGybf4Op0C/tZyRjShToTKyeChMurlz84sv6V8KxJtcVqIeXyapN+IRFSKNBE8MI8SDd zqkvON4KsswSi292eKD5EiSiF38qWQ6SCucmBETh/1ZRrCMgkjMSWfRRTU4I3fB8A4NG +D1A== X-Gm-Message-State: AOAM5329fuHb/o+3NgL8xV5bZ+lOlb7uE+c6l6wtJJZp4okWkSyEMRX/ NHVqZSl/1rwHyPh5T9Vdujw= X-Google-Smtp-Source: ABdhPJxWYRJJoB7qbApKR73WSUCCz3ZkRobZBJnYY9ZsYNZaJ/rYAlVR7euwgFxY4G1qBS/8Ndr/Iw== X-Received: by 2002:a17:90a:4e43:: with SMTP id t3mr22040068pjl.126.1613976202293; Sun, 21 Feb 2021 22:43:22 -0800 (PST) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id 188sm8688195pfz.119.2021.02.21.22.43.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Feb 2021 22:43:21 -0800 (PST) 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 3/4] modsign: Add codeSigning EKU when generating X.509 key generation config Date: Mon, 22 Feb 2021 14:42:50 +0800 Message-Id: <20210222064251.13374-4-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210222064251.13374-1-jlee@suse.com> References: <20210222064251.13374-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: keyrings@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 Feb 22 06:42:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 12097977 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.7 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,URIBL_BLOCKED,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 A9414C433E0 for ; Mon, 22 Feb 2021 06:44:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B41364E44 for ; Mon, 22 Feb 2021 06:44:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230040AbhBVGop (ORCPT ); Mon, 22 Feb 2021 01:44:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbhBVGoh (ORCPT ); Mon, 22 Feb 2021 01:44:37 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E737C061574; Sun, 21 Feb 2021 22:43:57 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id b145so6001309pfb.4; Sun, 21 Feb 2021 22:43:57 -0800 (PST) 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=M1CBK07C46laJoyWYovF4lSgfEz56MEL8US4G4KcnR0=; b=VMN5tc4DR8o2nDN/b5KFvZqQa6duu77h7sBp5OmZ2ROJmMJVtJKZMpc9GHprk1jDHb ARN/Xf82uzfcaJdAHz/T4B+E2zuvrAo90wgUZG3Dld2wYmR6qqIR7z2r77JfUwca3UJY dFR3NNQosShszX7Znz7D1vysGEWDj7YwsJKFKAe+osnWMvYW5MWhiy/wfaKjaUNL5Xou tEsYM7mkvWZ2blnVtVAtemsQbZn9FMHy1w2ni/dBCw1Y+5dipyfkbxJPwz+fR429v1to /bL8TKN9onyiZDZefBqntXFS5G7dubbubE1pueIFhA/aL2cJTx46DxfBH7mxMDNPfiVV HbiA== 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=M1CBK07C46laJoyWYovF4lSgfEz56MEL8US4G4KcnR0=; b=kxfcIyafIRhKVB8aCGf/xRlymWB4qll1sRFNer9tQPqdV65RDljPZWvYdmQaVYN2tC f5c/t1upXkz0Q03Yc1oncD4AA43uA5RsJNnsZZc5KTXOSg+J51Ct8SGIX5kU3hBFUXYk PWxJ69dhQNyIX+OL2NyWY9a7tQH198M/qhxlX7OI1UVviwNfQhWAxL8bhFt4wYDnDeu6 cVPU4d1pq28lrWGerQkdftelAcRcGgXTloVsKcJQv8S0xcy4NvsR45sumVKI+G0Dx2Tu pOJUJlVAwFrtxb10ifrLvn9x7e9Xzrk/VUb6fvVFGv1hDTyXGTfs0wyubatnIW7Ky1kp wNCA== X-Gm-Message-State: AOAM533voAlIKS76gZIKdDDUJUHXAmALnUdB/bXOb/HO/11/h81d2mI/ wGXBLNBX0yMqZ8g45vJ+1Jo= X-Google-Smtp-Source: ABdhPJyqLaJut8n4jfDP5K19sjmiimEx9q9MGmuYnzLAtKKOKI8pG9AFY6QqZaKgUXolFrpGwmf/Og== X-Received: by 2002:a65:5c85:: with SMTP id a5mr10843098pgt.355.1613976236773; Sun, 21 Feb 2021 22:43:56 -0800 (PST) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id 188sm8688195pfz.119.2021.02.21.22.43.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Feb 2021 22:43:56 -0800 (PST) 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 4/4] Documentation/admin-guide/module-signing.rst: add openssl command option example for CodeSign EKU Date: Mon, 22 Feb 2021 14:42:51 +0800 Message-Id: <20210222064251.13374-5-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210222064251.13374-1-jlee@suse.com> References: <20210222064251.13374-1-jlee@suse.com> Precedence: bulk List-ID: X-Mailing-List: keyrings@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..b57b30c7125f 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 be enabled, the following openssl +command option should be added 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.