From patchwork Tue Mar 23 03:55:18 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: 12156779 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 99206C433DB for ; Tue, 23 Mar 2021 03:56:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61641619A0 for ; Tue, 23 Mar 2021 03:56:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229866AbhCWD4B (ORCPT ); Mon, 22 Mar 2021 23:56:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbhCWDzz (ORCPT ); Mon, 22 Mar 2021 23:55:55 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97992C061574; Mon, 22 Mar 2021 20:55:55 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id j25so12891424pfe.2; Mon, 22 Mar 2021 20:55:55 -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=LAnagOQtR6OSecXobxKo5aH6LIwo34Q5YF2NxFUz/T/ScLdnJPjuaxppHlUhNENQFb Zw9agxbeo29qCNWkR71Lx03Gfyu27jpS5DhloCobwGYJ1zAvMQFtV6nxfy9c69ngewYf Y8eczQHzb5n/zu3EkdD5A24FKWuDSUvgKOXMFrwCcbI7uZL2dI9xJotBpViiEML4w5h1 iTcCUXFMDoqdMzvO+7jsnJ13RFix2TH/JsWJKOWNKt0L5WJ6HS/tHaCk66OhtK2qqdvA gAoAjbrwepg5WAin/faMScd0RzN84xHJiVZg/hFN/MNTWx7b9fKTK9QJ7uBSe1FFYp80 u2zg== 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=Bt/9xilR1PUsD2+dK+FGeW+kjwOqiTk9hh8wrZ49ixpMv/y5Yh9uXwsQ7BkLbCsSWx AObzalSbIDVz8CPoLFTBE/rBO8VKLDWP6gdWklq9yVy7EmEDrxXqMST4Y0EC38RU8vXY vTBner992lquHEMOhSb024pPkmMf6268gLFxMRNoAt/y2kqnAGFBAI1I7i+XuqdrkY3o kmBBYMo1PGaXL7rlblbbEOQjf8cr/W+3mvz6plzWiwN9fRNAUAnk8jrRJhaxheu8osDA BYGofIPyq/3p72C/hwDq9y3FHL7wz3imA0yojix98MZPnynXNgwdMLrxeh+ULIArTt4o 2pnQ== X-Gm-Message-State: AOAM533rV+kMH+ADbXsJfpMSoU2goH3FGR+r6aKeEi4Ti/dbkNP/pdqy rNEaxUaDFGfjDW5R/0KIdxM= X-Google-Smtp-Source: ABdhPJwLeDHNOHF69RS1K7BEJgVhAn4UKH9nmPvD+PworcdCLSPxmEvvaxFwm+y9ze4cFA/jf49eCg== X-Received: by 2002:aa7:9431:0:b029:1f1:52fd:5444 with SMTP id y17-20020aa794310000b02901f152fd5444mr2800093pfo.47.1616471755208; Mon, 22 Mar 2021 20:55:55 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id z22sm14415630pfa.41.2021.03.22.20.55.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Mar 2021 20:55:54 -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 1/4] X.509: Add CodeSigning extended key usage parsing Date: Tue, 23 Mar 2021 11:55:18 +0800 Message-Id: <20210323035521.5843-2-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210323035521.5843-1-jlee@suse.com> References: <20210323035521.5843-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 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 Tue Mar 23 03:55:19 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: 12156783 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 ADF1FC433DB for ; Tue, 23 Mar 2021 03:57:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E3B7619AB for ; Tue, 23 Mar 2021 03:57:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbhCWD4c (ORCPT ); Mon, 22 Mar 2021 23:56:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbhCWDz6 (ORCPT ); Mon, 22 Mar 2021 23:55:58 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C055C061574; Mon, 22 Mar 2021 20:55:58 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id j25so12891511pfe.2; Mon, 22 Mar 2021 20:55:58 -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=QkjwxOMu48G0rNB9DuyGof5vlGstmavJYCB/+VQdvAM595uqyDsPQFkciK0HhNjHgA Yp6HubUzxDN20L5GJcH3uFGI+Q7yhHU4KAmJVmUPN7oief0llOSpBUmaXLzGkmesM1hp kAiBEROEVM3XZIzampgz99D7PslvQMzv7Y+wcAskqxNXioDw1Ry9RazM11E5q+/scOgq OC1hMlzbHGFXnun+Vh4lNbzy0zJAf+ETIHKVFK9wBZLl3OKPgQQcD5mvzzzXJmTvtm/b /5H5BISAtzlDuCK+VmGlEjPaBkODXjyS+pUd+5oeCA/c3CbYzqBk8xGPnMyOiIl3jooj wx9g== 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=n1+hzNSOkOhAkTk5ri9BJkrNZKRJupMzVDz3Eg58Pbx9sxngaKFR9T5VBvsu716k9Q m0QfPKQh0KC/2LUn1U/NpXMh2qf97IIfeLGzY4xbY0ltqC2DNIsGe/PyW65wr01bIsY6 Ursj+rZCxkTISmyncQc+T1tEBx+RnOhGpSdKB84vniiQt4kvFezdhghOjZrFzHK+a4jK ud2vytsY/FRe0D53PMSgd1NXZYhbMdj94C9KKD/YtIT6UnvulweKnWhvwq7Z7V/Z36Z0 EQI9GPmlpWjCfmc96xy4o5f6S3CHpSC/jvu79qCGdO5PKDnzYC3ijr2sdC2QrDRnKpOl 7kCw== X-Gm-Message-State: AOAM532YKbM2Vgp7P2VNDeHHfinHvDj3+3En5rs5RWnX6j25WLmbA/W7 s3uffPj7m85y2FUBXQnznJ4= X-Google-Smtp-Source: ABdhPJzX9V6pWRrvwRoO5KRrO8UHnbk259A5RNfdTTVDIiJWBOSjOaBSchUEJpr6pQVOg2Wt+YB6BQ== X-Received: by 2002:a62:1dcc:0:b029:209:7eef:b14e with SMTP id d195-20020a621dcc0000b02902097eefb14emr2917965pfd.3.1616471757814; Mon, 22 Mar 2021 20:55:57 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id z22sm14415630pfa.41.2021.03.22.20.55.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Mar 2021 20:55:57 -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 2/4] PKCS#7: Check codeSigning EKU for kernel module and kexec pe verification Date: Tue, 23 Mar 2021 11:55:19 +0800 Message-Id: <20210323035521.5843-3-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210323035521.5843-1-jlee@suse.com> References: <20210323035521.5843-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 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 Tue Mar 23 03:55:20 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: 12156785 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 35A74C433E1 for ; Tue, 23 Mar 2021 03:57:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7850619AF for ; Tue, 23 Mar 2021 03:57:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229920AbhCWD4d (ORCPT ); Mon, 22 Mar 2021 23:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229865AbhCWD4B (ORCPT ); Mon, 22 Mar 2021 23:56:01 -0400 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 645B7C061574; Mon, 22 Mar 2021 20:56:00 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id m7so10382794pgj.8; Mon, 22 Mar 2021 20:56:00 -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=lx9thgP6A3ioWxhBGad3TsmfVCj/CEm38s8KDe6j9ERkfI6WyXkisIvBorluUgzQeo futndHh92nTdosWgeacAjHNj1iTXitGIbvqmlGLwb9iabbuyD04hbWdnNBqp51VqJBsC RPl02or6ymxgd5zIzuzetVt446IbNqLSYF16qSWP0ZTNMjYFAywnI3P9KSsSPoftyphp Z7dMqQdBPqR49/+4Cfa3BIJUfuWu07maN/WUycgznoysPz01VsEdaMHVODjFGuyShPXB CrcFCzy5OITlVdhu/0rzmLcBCYu908ZebpUQk2du/9JKB/zdPRWqVO7lX42ahSedNMYX jpoQ== 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=fT9nKOnDTS4rLgPezQqVxgvq1vW5eKVCYpSssbFmkXDUxbG5a3yT4ZCa/ecf6FTP2g 35mOstL97hv3lH9jndNYmvhoSvU4I3MzdIFBEWK1/sNd5ygjf8gTXsskxzdP58QnilGj FepCropzc/QvOONkib05q5u65G4gl1BeZRAx1+CeGnqSIp6ErpcBLagE2Lck1ecDQzLU koxtW01v0I5pwMe3m8RHGdPM4aosRaxSn1sZg870hVAD0zmoFH/OSawiamKOkeYF7WQy aePf4zShBIy0cybmfy68MeTVEXSvy4gNaWRNxgUV8Ms3AaqmWaoDS86Qa2+mLtJzyJxp Imjg== X-Gm-Message-State: AOAM530jtO2glic1b5yONOdVk/kET8PhXT9YTIOIcxFqzjM/dMUC/NP4 hgTsfzAzeJm4UEZdb23tPWw= X-Google-Smtp-Source: ABdhPJzlE5QixRFbHWxtBxVygZxYyuIdW208WvMLMiqYY6O27CeLlTz75CIc6X32y40nUW2j1NKyYA== X-Received: by 2002:a05:6a00:168a:b029:210:cdd5:c792 with SMTP id k10-20020a056a00168ab0290210cdd5c792mr2601708pfc.44.1616471760030; Mon, 22 Mar 2021 20:56:00 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id z22sm14415630pfa.41.2021.03.22.20.55.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Mar 2021 20:55:59 -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 3/4] modsign: Add codeSigning EKU when generating X.509 key generation config Date: Tue, 23 Mar 2021 11:55:20 +0800 Message-Id: <20210323035521.5843-4-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210323035521.5843-1-jlee@suse.com> References: <20210323035521.5843-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 Tue Mar 23 03:55:21 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: 12156795 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 B86E2C433E4 for ; Tue, 23 Mar 2021 03:57:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86C08619AC for ; Tue, 23 Mar 2021 03:57:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229944AbhCWD4e (ORCPT ); Mon, 22 Mar 2021 23:56:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbhCWD4D (ORCPT ); Mon, 22 Mar 2021 23:56:03 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0D9BC061574; Mon, 22 Mar 2021 20:56:02 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id v186so10383240pgv.7; Mon, 22 Mar 2021 20:56:02 -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=UXpW9XC2NJqo7rfMeftU26YMoK90BHzqbUDDT4ow5DfNL2VY+06Rp3ATLnompDaf29 URFgJYp6bGlRdf6keBw/FE901PTen0GhQYjwTk6cy4jhT4xib/LgUOwWieEVhO+sJtL7 wjcrbxUunWkk7MzMd/JsGvObERbO7waXPGrN2rkh59FTQWf2/q55VYiah2Ck3m0jeLX+ mWZolC7MH7YNibNKr9zFS745BMoJvI2qHpEcJW0HSpidbJXDE13vn+g9EQ8+HsWFeReh VWEuC0VwGiSzjOMRF9Dc/tG5wFBK+tZKtdMiXsLcxP6bMfMKRHZ5W6V54dPVbcvgrxlh lsLA== 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=hDTDBoVlhOT+p8Kv9G13LcLJwLfgUo33jbbwT42YR1AbyqEUnvvaAJ97zNyF1C5p4o tq7P0LXBT//7uPi1T9o9QPWJpbJjaTPAkiSdafhy0mvFfUOC64uAU0WdiEkrpyAzhhur b+LDoEogVBLMgzoRbRIDh/ueBtHy2cdzZjOQbhr2sLQqQf3xW/sxFxMV4f6QwPMGHDgd b1K3Owxq6OSGOfnae3CVUOp3ii5QggHrQ5ZHQm5Zd4o+vzMkuscCq1mvYwXmnTiE+rH0 U3WVqirzOoMjXIEGuKWFA5e++jlR6eUNiyvdD9k7QgekVrPbaf5KF6NLi26zLEo3iqja OrGA== X-Gm-Message-State: AOAM531BJ1plwk544CD1S+mtxj68+7JJJNHz//SL/NpvI2hZuirsKkAr gKZNLAxze21Gzjz3FTiVPMU= X-Google-Smtp-Source: ABdhPJydHbGnZnMAt1icAGF5YoesfMt9wBbr8Fj49YkpN2/TMf4kipg460iug9SOSvZFlO4f3LGzeA== X-Received: by 2002:aa7:9910:0:b029:1f1:b41b:f95c with SMTP id z16-20020aa799100000b02901f1b41bf95cmr2960636pff.5.1616471762418; Mon, 22 Mar 2021 20:56:02 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id z22sm14415630pfa.41.2021.03.22.20.56.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Mar 2021 20:56:02 -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 4/4] Documentation/admin-guide/module-signing.rst: add openssl command option example for CodeSign EKU Date: Tue, 23 Mar 2021 11:55:21 +0800 Message-Id: <20210323035521.5843-5-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210323035521.5843-1-jlee@suse.com> References: <20210323035521.5843-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..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.