Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1298942rdh; Mon, 25 Sep 2023 08:37:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2GNtITjgqv/fwoRTVsCxSbzTYpBRK0iGDmPjZIa4sKJdt4URnPjM+ClgQFBeQ81rAcZWY X-Received: by 2002:a05:6a20:9742:b0:153:52a3:b0d4 with SMTP id hs2-20020a056a20974200b0015352a3b0d4mr4507293pzc.34.1695656229400; Mon, 25 Sep 2023 08:37:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695656229; cv=none; d=google.com; s=arc-20160816; b=h8ALhGdgzimyI233ulrqiwIEEykchMUiyYbDt5b8MYi0m20bjnA/0NojXeYNafiWXc BRsDy61M1nZjr77jngC2jms+IlXyrAHO6ZvlnKIM7E+CkP70Dv34D/1TzN58f5ebT0Z/ Fe6YUuLnMnubCYOq0W3WdIyskddcFhgfppIEZvTfmmaimNINfPlrxEpTlq300IgTo8Fj cQaOKySfI1/5/zrF6sHdYRFNcjx9lFiUCq2GPh6v7QdIfaLczhsGUYSndk7kuMLtFM9v fZ/5CyvwJ0/dM54PFavwZDb8bbpOzUtl5fBTKJt6mA/4bBDiJjeNv0LKzu83VZqS8Kso WR+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:references:subject:cc:to:from :message-id:date:content-transfer-encoding:mime-version :dkim-signature; bh=UQWltzeBv3xqNgPFDrka9P7fok5CCLmW8OGuzYYjluo=; fh=3iDjHzPLkfXKpoDoF1f9f1mBTKocMboVGkhHQjHHryU=; b=nu2GsstZx585E77WDYGibaaXSIX4hDIYQp6vAfQuQIYywTVIVSC0q5cGDG9X6QnvaG XvNorKhOImPDPBOQgLt2VjST/jA8e2n0+dNjDAXJQktX7j5orRAWLD2cyFpEO7+KZJlf xCyuF4NEclReUPmKFfT4YmpxBSvMIEVpc+SqoBQ2vJS4w5SNbOSKpX++gdtm/cY5qsUY E4yHRGlAEMH9G80ZSiWW1nJPHfCAudSOh8INXfKuBjszhVZA7ALG2lUKpGRz8dH6pAvF b3bwEJ9LEi+ERj3s9dOcUpc0Habl1nz1+gUJRNA4nI1Y6KJsMonUCKAen8dtfOnxYKh6 srsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=k+zqdzIV; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id n13-20020a65488d000000b00578ed63fdacsi10218074pgs.878.2023.09.25.08.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 08:37:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=k+zqdzIV; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 69D9A818652E; Mon, 25 Sep 2023 08:34:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbjIYPef (ORCPT + 99 others); Mon, 25 Sep 2023 11:34:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjIYPee (ORCPT ); Mon, 25 Sep 2023 11:34:34 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13183FF; Mon, 25 Sep 2023 08:34:27 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E417AC433C7; Mon, 25 Sep 2023 15:34:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695656066; bh=XyGsm5/PbpvEovZpaNFvRoEuiAOdF6BhhvWoFRiFmRU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=k+zqdzIVSTqXigKjgRglWgVHpsaTxZ330azxAhyw3ZHpdYiZZP6n+xdfEXrnpxygL kFG96oq1x9A9bmtJhbUZ04FbZHqHvfK6NTFjT4ULBNAlfujAdHDAmSJ4YFvtAfrl3C t18He00/2mrfhJBKj1g3lQyRKX9TX7dUP3q168M6a1AWCBkzX1z4K2SvIQW4+zlqqL bcbjzcHIlDeXnBR7jfIfWktA4sLagzAHrRi6YaD0lJnVYXr4KftT8/NMFszIJQca2U rXZcat7mpqbPLKfNmSxKqr6G0BAtG4fhjqYCPPxz9hn+EIKkdaY5XmTWsZXoAeTvx8 CkRGkRqAlyVTA== Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 25 Sep 2023 18:34:17 +0300 Message-Id: From: "Jarkko Sakkinen" To: "David Gstir" , "Mimi Zohar" , "James Bottomley" , "Herbert Xu" , "David S. Miller" Cc: "Shawn Guo" , "Jonathan Corbet" , "Sascha Hauer" , "Pengutronix Kernel Team" , "Fabio Estevam" , "NXP Linux Team" , "Ahmad Fatoum" , "sigma star Kernel Team" , "David Howells" , "Li Yang" , "Paul Moore" , "James Morris" , "Serge E. Hallyn" , "Paul E. McKenney" , "Randy Dunlap" , "Catalin Marinas" , "Rafael J. Wysocki" , "Tejun Heo" , "Steven Rostedt (Google)" , , , , , , , , , "Richard Weinberger" , "David Oberhollenzer" Subject: Re: [PATCH v3 2/3] KEYS: trusted: Introduce support for NXP DCP-based trusted keys X-Mailer: aerc 0.14.0 References: <20230918141826.8139-1-david@sigma-star.at> <20230918141826.8139-3-david@sigma-star.at> In-Reply-To: <20230918141826.8139-3-david@sigma-star.at> X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 25 Sep 2023 08:34:34 -0700 (PDT) On Mon Sep 18, 2023 at 5:18 PM EEST, David Gstir wrote: > DCP (Data Co-Processor) is the little brother of NXP's CAAM IP. > > Beside of accelerated crypto operations, it also offers support for > hardware-bound keys. Using this feature it is possible to implement a blo= b > mechanism just like CAAM offers. Unlike on CAAM, constructing and > parsing the blob has to happen in software. > > We chose the following format for the blob: Who is we? And there is no choosing anything if the below structure if hardware defined (not software defined): > /* > * struct dcp_blob_fmt - DCP BLOB format. > * > * @fmt_version: Format version, currently being %1 > * @blob_key: Random AES 128 key which is used to encrypt @payload, > * @blob_key itself is encrypted with OTP or UNIQUE device key= in > * AES-128-ECB mode by DCP. > * @nonce: Random nonce used for @payload encryption. > * @payload_len: Length of the plain text @payload. > * @payload: The payload itself, encrypted using AES-128-GCM and @blob_ke= y, > * GCM auth tag of size AES_BLOCK_SIZE is attached at the end o= f it. > * > * The total size of a DCP BLOB is sizeof(struct dcp_blob_fmt) + @payload= _len + > * AES_BLOCK_SIZE. > */ > struct dcp_blob_fmt { > __u8 fmt_version; > __u8 blob_key[AES_KEYSIZE_128]; > __u8 nonce[AES_KEYSIZE_128]; > __le32 payload_len; > __u8 payload[]; > } __packed; > > @payload is the key provided by trusted_key_ops->seal(). > > By default the UNIQUE device key is used, it is also possible to use > the OTP key. While the UNIQUE device key should be unique it is not > entirely clear whether this is the case due to unclear documentation. > If someone wants to be sure they can burn their own unique key > into the OTP fuse and set the use_otp_key module parameter. > > Co-developed-by: Richard Weinberger > Signed-off-by: Richard Weinberger > Co-developed-by: David Oberhollenzer > Signed-off-by: David Oberhollenzer > Signed-off-by: David Gstir > --- > .../admin-guide/kernel-parameters.txt | 13 + Separate commit for this. > MAINTAINERS | 9 + Ditto (i.e. total two additional patches). > include/keys/trusted_dcp.h | 11 + > security/keys/trusted-keys/Kconfig | 9 +- > security/keys/trusted-keys/Makefile | 2 + > security/keys/trusted-keys/trusted_core.c | 6 +- > security/keys/trusted-keys/trusted_dcp.c | 311 ++++++++++++++++++ > 7 files changed, 359 insertions(+), 2 deletions(-) > create mode 100644 include/keys/trusted_dcp.h > create mode 100644 security/keys/trusted-keys/trusted_dcp.c > > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentat= ion/admin-guide/kernel-parameters.txt > index 0a1731a0f0ef..c11eda8b38e0 100644 > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@ -6566,6 +6566,7 @@ > - "tpm" > - "tee" > - "caam" > + - "dcp" > If not specified then it defaults to iterating through > the trust source list starting with TPM and assigns the > first trust source as a backend which is initialized > @@ -6581,6 +6582,18 @@ > If not specified, "default" is used. In this case, > the RNG's choice is left to each individual trust source. > =20 > + trusted.dcp_use_otp_key > + This is intended to be used in combination with > + trusted.source=3Ddcp and will select the DCP OTP key > + instead of the DCP UNIQUE key blob encryption. > + > + trusted.dcp_skip_zk_test > + This is intended to be used in combination with > + trusted.source=3Ddcp and will disable the check if all > + the blob key is zero'ed. This is helpful for situations where > + having this key zero'ed is acceptable. E.g. in testing > + scenarios. > + > tsc=3D Disable clocksource stability checks for TSC. > Format: > [x86] reliable: mark tsc clocksource as reliable, this > diff --git a/MAINTAINERS b/MAINTAINERS > index 90f13281d297..988d01226131 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -11647,6 +11647,15 @@ S: Maintained > F: include/keys/trusted_caam.h > F: security/keys/trusted-keys/trusted_caam.c > =20 > +KEYS-TRUSTED-DCP > +M: David Gstir > +R: sigma star Kernel Team > +L: linux-integrity@vger.kernel.org > +L: keyrings@vger.kernel.org > +S: Supported > +F: include/keys/trusted_dcp.h > +F: security/keys/trusted-keys/trusted_dcp.c > + > KEYS-TRUSTED-TEE > M: Sumit Garg > L: linux-integrity@vger.kernel.org > diff --git a/include/keys/trusted_dcp.h b/include/keys/trusted_dcp.h > new file mode 100644 > index 000000000000..9aaa42075b40 > --- /dev/null > +++ b/include/keys/trusted_dcp.h > @@ -0,0 +1,11 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (C) 2021 sigma star gmbh > + */ > + > +#ifndef TRUSTED_DCP_H > +#define TRUSTED_DCP_H > + > +extern struct trusted_key_ops dcp_trusted_key_ops; > + > +#endif > diff --git a/security/keys/trusted-keys/Kconfig b/security/keys/trusted-k= eys/Kconfig > index dbfdd8536468..c6b80b7e5c78 100644 > --- a/security/keys/trusted-keys/Kconfig > +++ b/security/keys/trusted-keys/Kconfig > @@ -33,6 +33,13 @@ config TRUSTED_KEYS_CAAM > Enable use of NXP's Cryptographic Accelerator and Assurance Module > (CAAM) as trusted key backend. > =20 > -if !TRUSTED_KEYS_TPM && !TRUSTED_KEYS_TEE && !TRUSTED_KEYS_CAAM > +config TRUSTED_KEYS_DCP > + bool "DCP-based trusted keys" > + depends on CRYPTO_DEV_MXS_DCP >=3D TRUSTED_KEYS > + default y > + help > + Enable use of NXP's DCP (Data Co-Processor) as trusted key backend. > + > +if !TRUSTED_KEYS_TPM && !TRUSTED_KEYS_TEE && !TRUSTED_KEYS_CAAM && !TRUS= TED_KEYS_DCP > comment "No trust source selected!" > endif > diff --git a/security/keys/trusted-keys/Makefile b/security/keys/trusted-= keys/Makefile > index 735aa0bc08ef..f0f3b27f688b 100644 > --- a/security/keys/trusted-keys/Makefile > +++ b/security/keys/trusted-keys/Makefile > @@ -14,3 +14,5 @@ trusted-$(CONFIG_TRUSTED_KEYS_TPM) +=3D tpm2key.asn1.o > trusted-$(CONFIG_TRUSTED_KEYS_TEE) +=3D trusted_tee.o > =20 > trusted-$(CONFIG_TRUSTED_KEYS_CAAM) +=3D trusted_caam.o > + > +trusted-$(CONFIG_TRUSTED_KEYS_DCP) +=3D trusted_dcp.o > diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/tr= usted-keys/trusted_core.c > index c6fc50d67214..8af0988be850 100644 > --- a/security/keys/trusted-keys/trusted_core.c > +++ b/security/keys/trusted-keys/trusted_core.c > @@ -10,6 +10,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -30,7 +31,7 @@ MODULE_PARM_DESC(rng, "Select trusted key RNG"); > =20 > static char *trusted_key_source; > module_param_named(source, trusted_key_source, charp, 0); > -MODULE_PARM_DESC(source, "Select trusted keys source (tpm, tee or caam)"= ); > +MODULE_PARM_DESC(source, "Select trusted keys source (tpm, tee, caam or = dcp)"); > =20 > static const struct trusted_key_source trusted_key_sources[] =3D { > #if defined(CONFIG_TRUSTED_KEYS_TPM) > @@ -42,6 +43,9 @@ static const struct trusted_key_source trusted_key_sour= ces[] =3D { > #if defined(CONFIG_TRUSTED_KEYS_CAAM) > { "caam", &trusted_key_caam_ops }, > #endif > +#if defined(CONFIG_TRUSTED_KEYS_DCP) > + { "dcp", &dcp_trusted_key_ops }, > +#endif > }; > =20 > DEFINE_STATIC_CALL_NULL(trusted_key_init, *trusted_key_sources[0].ops->i= nit); > diff --git a/security/keys/trusted-keys/trusted_dcp.c b/security/keys/tru= sted-keys/trusted_dcp.c > new file mode 100644 > index 000000000000..8d19b92fe976 > --- /dev/null > +++ b/security/keys/trusted-keys/trusted_dcp.c > @@ -0,0 +1,311 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (C) 2021 sigma star gmbh > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define DCP_BLOB_VERSION 1 > +#define DCP_BLOB_AUTHLEN 16 > + > +/** > + * struct dcp_blob_fmt - DCP BLOB format. > + * > + * @fmt_version: Format version, currently being %1. > + * @blob_key: Random AES 128 key which is used to encrypt @payload, > + * @blob_key itself is encrypted with OTP or UNIQUE device ke= y in > + * AES-128-ECB mode by DCP. > + * @nonce: Random nonce used for @payload encryption. > + * @payload_len: Length of the plain text @payload. > + * @payload: The payload itself, encrypted using AES-128-GCM and @blob_k= ey, > + * GCM auth tag of size DCP_BLOB_AUTHLEN is attached at the en= d of it. > + * > + * The total size of a DCP BLOB is sizeof(struct dcp_blob_fmt) + @payloa= d_len + > + * DCP_BLOB_AUTHLEN. > + */ > +struct dcp_blob_fmt { > + __u8 fmt_version; > + __u8 blob_key[AES_KEYSIZE_128]; > + __u8 nonce[AES_KEYSIZE_128]; > + __le32 payload_len; > + __u8 payload[]; > +} __packed; > + > +static bool use_otp_key; > +module_param_named(dcp_use_otp_key, use_otp_key, bool, 0); > +MODULE_PARM_DESC(dcp_use_otp_key, "Use OTP instead of UNIQUE key for sea= ling"); > + > +static bool skip_zk_test; > +module_param_named(dcp_skip_zk_test, skip_zk_test, bool, 0); > +MODULE_PARM_DESC(dcp_skip_zk_test, "Don't test whether device keys are z= ero'ed"); > + > +static unsigned int calc_blob_len(unsigned int payload_len) > +{ > + return sizeof(struct dcp_blob_fmt) + payload_len + DCP_BLOB_AUTHLEN; > +} > + > +static int do_dcp_crypto(u8 *in, u8 *out, bool is_encrypt) > +{ > + int res =3D 0; > + struct skcipher_request *req =3D NULL; > + DECLARE_CRYPTO_WAIT(wait); > + struct scatterlist src_sg, dst_sg; > + struct crypto_skcipher *tfm; > + u8 paes_key[DCP_PAES_KEYSIZE]; > + > + if (use_otp_key) > + paes_key[0] =3D DCP_PAES_KEY_OTP; > + else > + paes_key[0] =3D DCP_PAES_KEY_UNIQUE; > + > + tfm =3D crypto_alloc_skcipher("ecb-paes-dcp", CRYPTO_ALG_INTERNAL, > + CRYPTO_ALG_INTERNAL); > + if (IS_ERR(tfm)) { > + res =3D PTR_ERR(tfm); > + pr_err("Unable to request DCP pAES-ECB cipher: %i\n", res); > + tfm =3D NULL; > + goto out; > + } > + > + req =3D skcipher_request_alloc(tfm, GFP_NOFS); > + if (!req) { > + res =3D -ENOMEM; > + goto out; > + } > + > + skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG | > + CRYPTO_TFM_REQ_MAY_SLEEP, > + crypto_req_done, &wait); > + res =3D crypto_skcipher_setkey(tfm, paes_key, sizeof(paes_key)); > + if (res < 0) > + goto out; > + > + sg_init_one(&src_sg, in, AES_KEYSIZE_128); > + sg_init_one(&dst_sg, out, AES_KEYSIZE_128); > + skcipher_request_set_crypt(req, &src_sg, &dst_sg, AES_KEYSIZE_128, > + NULL); > + > + if (is_encrypt) > + res =3D crypto_wait_req(crypto_skcipher_encrypt(req), &wait); > + else > + res =3D crypto_wait_req(crypto_skcipher_decrypt(req), &wait); > + > +out: > + skcipher_request_free(req); > + crypto_free_skcipher(tfm); > + > + return res; > +} > + > +static int do_aead_crypto(u8 *in, u8 *out, size_t len, u8 *key, u8 *nonc= e, > + bool is_encrypt) > +{ > + struct aead_request *aead_req =3D NULL; > + struct scatterlist src_sg, dst_sg; > + struct crypto_aead *aead; > + int ret; > + > + aead =3D crypto_alloc_aead("gcm(aes)", 0, CRYPTO_ALG_ASYNC); > + if (IS_ERR(aead)) { > + ret =3D PTR_ERR(aead); > + pr_err("Unable to request AES-GCM cipher: %i\n", ret); > + goto out; > + } > + > + ret =3D crypto_aead_setauthsize(aead, DCP_BLOB_AUTHLEN); > + if (ret < 0) { > + pr_err("Can't set crypto auth tag len: %d\n", ret); > + goto free_aead; > + } > + > + aead_req =3D aead_request_alloc(aead, GFP_KERNEL); > + if (!aead_req) { > + ret =3D -ENOMEM; > + goto free_aead; > + } > + > + sg_init_one(&src_sg, in, len); > + if (is_encrypt) { > + /* > + * If we encrypt our buffer has extra space for the auth tag. > + */ > + sg_init_one(&dst_sg, out, len + DCP_BLOB_AUTHLEN); > + } else { > + sg_init_one(&dst_sg, out, len); > + } > + > + aead_request_set_crypt(aead_req, &src_sg, &dst_sg, len, nonce); > + aead_request_set_callback(aead_req, CRYPTO_TFM_REQ_MAY_SLEEP, NULL, > + NULL); > + aead_request_set_ad(aead_req, 0); > + > + if (crypto_aead_setkey(aead, key, AES_KEYSIZE_128)) { > + pr_err("Can't set crypto AEAD key\n"); > + ret =3D -EINVAL; > + goto free_req; > + } > + > + if (is_encrypt) > + ret =3D crypto_aead_encrypt(aead_req); > + else > + ret =3D crypto_aead_decrypt(aead_req); > + > +free_req: > + aead_request_free(aead_req); > +free_aead: > + crypto_free_aead(aead); > +out: > + return ret; > +} > + > +static int decrypt_blob_key(u8 *key) > +{ > + return do_dcp_crypto(key, key, false); > +} > + > +static int encrypt_blob_key(u8 *key) > +{ > + return do_dcp_crypto(key, key, true); > +} > + > +static int trusted_dcp_seal(struct trusted_key_payload *p, char *datablo= b) > +{ > + struct dcp_blob_fmt *b =3D (struct dcp_blob_fmt *)p->blob; > + int blen, ret; > + > + blen =3D calc_blob_len(p->key_len); > + if (blen > MAX_BLOB_SIZE) > + return -E2BIG; > + > + b->fmt_version =3D DCP_BLOB_VERSION; > + get_random_bytes(b->nonce, AES_KEYSIZE_128); > + get_random_bytes(b->blob_key, AES_KEYSIZE_128); > + > + ret =3D do_aead_crypto(p->key, b->payload, p->key_len, b->blob_key, > + b->nonce, true); > + if (ret) { > + pr_err("Unable to encrypt blob payload: %i\n", ret); > + return ret; > + } > + > + ret =3D encrypt_blob_key(b->blob_key); > + if (ret) { > + pr_err("Unable to encrypt blob key: %i\n", ret); > + return ret; > + } > + > + b->payload_len =3D get_unaligned_le32(&p->key_len); > + p->blob_len =3D blen; > + return 0; > +} > + > +static int trusted_dcp_unseal(struct trusted_key_payload *p, char *datab= lob) > +{ > + struct dcp_blob_fmt *b =3D (struct dcp_blob_fmt *)p->blob; > + int blen, ret; > + > + if (b->fmt_version !=3D DCP_BLOB_VERSION) { > + pr_err("DCP blob has bad version: %i, expected %i\n", > + b->fmt_version, DCP_BLOB_VERSION); > + ret =3D -EINVAL; > + goto out; > + } > + > + p->key_len =3D le32_to_cpu(b->payload_len); > + blen =3D calc_blob_len(p->key_len); > + if (blen !=3D p->blob_len) { > + pr_err("DCP blob has bad length: %i !=3D %i\n", blen, > + p->blob_len); > + ret =3D -EINVAL; > + goto out; > + } > + > + ret =3D decrypt_blob_key(b->blob_key); > + if (ret) { > + pr_err("Unable to decrypt blob key: %i\n", ret); > + goto out; > + } > + > + ret =3D do_aead_crypto(b->payload, p->key, p->key_len + DCP_BLOB_AUTHLE= N, > + b->blob_key, b->nonce, false); > + if (ret) { > + pr_err("Unwrap of DCP payload failed: %i\n", ret); > + goto out; > + } > + > + ret =3D 0; > +out: > + return ret; > +} > + > +static int test_for_zero_key(void) > +{ > + static const u8 bad[] =3D {0x9a, 0xda, 0xe0, 0x54, 0xf6, 0x3d, 0xfa, 0x= ff, > + 0x5e, 0xa1, 0x8e, 0x45, 0xed, 0xf6, 0xea, 0x6f}; > + void *buf =3D NULL; > + int ret =3D 0; > + > + if (skip_zk_test) > + goto out; > + > + buf =3D kmalloc(AES_BLOCK_SIZE, GFP_KERNEL); > + if (!buf) { > + ret =3D -ENOMEM; > + goto out; > + } > + > + memset(buf, 0x55, AES_BLOCK_SIZE); > + > + ret =3D do_dcp_crypto(buf, buf, true); > + if (ret) > + goto out; > + > + if (memcmp(buf, bad, AES_BLOCK_SIZE) =3D=3D 0) { > + pr_err("Device neither in secure nor trusted mode!\n"); > + ret =3D -EINVAL; > + } > +out: > + kfree(buf); > + return ret; > +} > + > +static int trusted_dcp_init(void) > +{ > + int ret; > + > + if (use_otp_key) > + pr_info("Using DCP OTP key\n"); > + > + ret =3D test_for_zero_key(); > + if (ret) { > + pr_err("Test for zero'ed keys failed: %i\n", ret); > + > + return -EINVAL; > + } > + > + return register_key_type(&key_type_trusted); > +} > + > +static void trusted_dcp_exit(void) > +{ > + unregister_key_type(&key_type_trusted); > +} > + > +struct trusted_key_ops dcp_trusted_key_ops =3D { > + .exit =3D trusted_dcp_exit, > + .init =3D trusted_dcp_init, > + .seal =3D trusted_dcp_seal, > + .unseal =3D trusted_dcp_unseal, > + .migratable =3D 0, > +}; > --=20 > 2.35.3 BR, Jarkko