From patchwork Mon May 24 02:15:37 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: 446534 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, 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 64A5CC47082 for ; Mon, 24 May 2021 02:16:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F7FB61152 for ; Mon, 24 May 2021 02:16:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232212AbhEXCR4 (ORCPT ); Sun, 23 May 2021 22:17:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232181AbhEXCRz (ORCPT ); Sun, 23 May 2021 22:17:55 -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 C9776C061574; Sun, 23 May 2021 19:16:26 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id e15so7228434plh.1; Sun, 23 May 2021 19:16:26 -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=yT6CAnQjd1D49HHgiYY1r24DT674aBCTUWawwoMceAU=; b=e/Q/uFQU9E2sCnd5rs2wvbkMmgo9ak8GOQQySy8NchYMzNtJkJnSEm8iZkCf/5KWh7 FbHSQjGeCjk1HxLBeCixsdnTkp4SvJNSXjzR/aN91S5T8DTmj2+4EJ/E/pDUk60JgIYb 3zCB2qG07DBgMRkJOFOxGk/Q+L1GtvqHBp0rv87wsfMchhprFBVYPwUri1pH3k17GRcH tmLfmw+RaBmUQxzcGG2XxbUQqgPSDW7WlPJhdpPqQPJdBPhZoW1V4HM6OD2DH1JH15zC F53RNmaVVmiMaxQLI2cSFuhjLaaZjeU4pXGQSYk4QFLBK/V+Jkh2BQcVKlM7LTKFsDlu dfWQ== 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=yT6CAnQjd1D49HHgiYY1r24DT674aBCTUWawwoMceAU=; b=iuib8wb4JUGDScQcuDoYWd98cCzBWjZa2j+L3Wxz59KEEJ6Xc/TFMSzIAAsiFwuvli 37w2LWNF1ZIdd3e6s3u0z9LRzNacn1d8vVnTBv/qK+QN7ee2zi1MZRsT4mRbN4tTsDIc 87eSSTkgFavDz10e5jOHWL+VSQzJE+2QDNFMQAVGTyCoV1K2u37tZSJW7csP/YJaHhxS 5KPcD7FdPkfSOlPAfJdGoSQiGi/hlmxEJH9ZBV2YM2+Mec5Q61i0gYZm34C3nFN8E+cN UqquxHEx3w98ULb2f8a885WJgHeyFpJ4Yj/sMfrgzOmir1WwvZ2p11mkYfvh/0b+p5LM 009w== X-Gm-Message-State: AOAM53259OCgsrFdehckno6YG4cGm1098C5pNHAZ1jBrlwoAjkDZpS+q gkuffhjx+bcF0FPkzwrKfHnEYV7Byjo= X-Google-Smtp-Source: ABdhPJwnRgxNX8wM3Zf9NW0OJ3HR1hczibMQ69jXQF/gRFMfjUxLCCBuge+blklLtDr+MHDdrvPS7g== X-Received: by 2002:a17:902:9342:b029:f0:cc10:3f with SMTP id g2-20020a1709029342b02900f0cc10003fmr23571228plp.72.1621822586321; Sun, 23 May 2021 19:16:26 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id h1sm9474960pfh.72.2021.05.23.19.16.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 May 2021 19:16:25 -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 , Varad Gautam , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" Subject: [PATCH v8,1/4] X.509: Add CodeSigning extended key usage parsing Date: Mon, 24 May 2021 10:15:37 +0800 Message-Id: <20210524021540.18736-2-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210524021540.18736-1-jlee@suse.com> References: <20210524021540.18736-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 | 25 +++++++++++++++++++++++++ include/crypto/public_key.h | 1 + include/linux/oid_registry.h | 5 +++++ 3 files changed, 31 insertions(+) diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c index 6d003096b5bc..996db9419474 100644 --- a/crypto/asymmetric_keys/x509_cert_parser.c +++ b/crypto/asymmetric_keys/x509_cert_parser.c @@ -542,6 +542,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); @@ -571,6 +573,29 @@ int x509_process_extension(void *context, size_t hdrlen, return 0; } + if (ctx->last_oid == OID_extKeyUsage) { + if (vlen < 2 || + 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 ((i + 10) > vlen || v[i] != ASN1_OID || v[i + 1] != 8) + 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 461b7aa587ba..8c8935f0eb73 100644 --- a/include/linux/oid_registry.h +++ b/include/linux/oid_registry.h @@ -125,9 +125,14 @@ enum OID { OID_TPMImportableKey, /* 2.23.133.10.1.4 */ OID_TPMSealedData, /* 2.23.133.10.1.5 */ + /* 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 parse_OID(const void *data, size_t datasize, enum OID *oid); extern int sprint_oid(const void *, size_t, char *, size_t); From patchwork Mon May 24 02:15:39 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: 446533 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,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 2D12EC47082 for ; Mon, 24 May 2021 02:16:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04EE461151 for ; Mon, 24 May 2021 02:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232181AbhEXCSP (ORCPT ); Sun, 23 May 2021 22:18:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232124AbhEXCSO (ORCPT ); Sun, 23 May 2021 22:18:14 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF60EC061574; Sun, 23 May 2021 19:16:47 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id h12so1692858plf.11; Sun, 23 May 2021 19:16:47 -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=3fW/X6CDJun4GeFDv0qlSVaN/oKNmuZ2pQXfLhoe16g=; b=cn4NKKCk9zGJHxIvHIWb1zRq4w9QEKeUYXpRjrzNEfEfFSaGn241Hc4LQZAmH/cbAC pjtliHmLlb1nVCJALgbfMeMQoDJPrtbqqd/eIT91+q1c1/dFjaat8aQv3lwBmn5BRzZA pHRdKVKt+u4tioNO5dMeWgvmKiOXued62OAQNAf8eei7DKSdtC/hG8k8VSfRp8QCtqYe UMO5XOxWWZ84WZxvWB3Tudgj7p65KVjVor2o8M54UxEec70bKqXSUhF1q+LR+dWKLW9O oTjoouiJ3fvmjnIdPsPYwvrohRddfwwu8wX7VSZLv8snpglJZljHukVtN7lPkK6r0+UF Aj7g== 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=3fW/X6CDJun4GeFDv0qlSVaN/oKNmuZ2pQXfLhoe16g=; b=reESoLeWjy31H1Rq6pALhFazhAydB/ONgjl09balTa3/WPW+KDq2J/ys2i3o7y0h1P q6/uUZ2KlWCjaOCHjPoU2DEwiWKNihUZR1GNnKj8h4LHM8dkhM04jPbxZmJfybHzHx0a nrLS6kw0yrUhWou26+ylGnbBzgKKtit/t01BjJXdS1LVl9IihKStxkg91ekoY5Bx9IGZ MRI3QbH9o6Vq2RRDAjewlLkljErqRIRSZlaA4hUskPovxJzKAtMfBnYJtB7ZQXUAgLvh pMc4SL+7q0wS0/n/xgNa2wXxgnlEtgjAKoaOKuYpKnz9z8asHBsjK6/GElUGYN++bIto ZKkQ== X-Gm-Message-State: AOAM5305PIXgdpLrxrzrS9ST/qHAiP8WH1tKtZCK+Bn4e7E0CK7cBTSe NLbAHFiEvyNtrfvzex4cTm0= X-Google-Smtp-Source: ABdhPJxaNVF7frLoMKPqVeF3Cy87Wi6uAPAxDwSftGNR3NA2kAMNDehc6F271eno8CIUUOyASXFkxA== X-Received: by 2002:a17:90a:a2b:: with SMTP id o40mr22851875pjo.214.1621822607425; Sun, 23 May 2021 19:16:47 -0700 (PDT) Received: from linux-l9pv.suse ([124.11.22.254]) by smtp.gmail.com with ESMTPSA id h1sm9474960pfh.72.2021.05.23.19.16.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 May 2021 19:16:47 -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 , Varad Gautam , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" Subject: [PATCH v8, 3/4] modsign: Add codeSigning EKU when generating X.509 key generation config Date: Mon, 24 May 2021 10:15:39 +0800 Message-Id: <20210524021540.18736-4-jlee@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20210524021540.18736-1-jlee@suse.com> References: <20210524021540.18736-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 359239a0ee9e..278e83d23aeb 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -99,6 +99,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))