From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
To: herbert@gondor.apana.org.au, davem@davemloft.net,
dhowells@redhat.com, mcoquelin.stm32@gmail.com,
alexandre.torgue@st.com, jmorris@namei.org, serge@hallyn.com,
nramas@linux.microsoft.com, tusharsu@linux.microsoft.com,
zohar@linux.ibm.com, vt@altlinux.org, gilad@benyossef.com,
pvanleeuwen@rambus.com, zhang.jia@linux.alibaba.com
Cc: tianjia.zhang@linux.alibaba.com, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org, keyrings@vger.kernel.org,
linux-crypto@vger.kernel.org, linux-integrity@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 8/8] integrity: Asymmetric digsig supports SM2-with-SM3 algorithm
Date: Thu, 09 Jul 2020 08:40:15 +0000 [thread overview]
Message-ID: <20200709084015.21886-9-tianjia.zhang@linux.alibaba.com> (raw)
In-Reply-To: <20200709084015.21886-1-tianjia.zhang@linux.alibaba.com>
Asymmetric digsig supports SM2-with-SM3 algorithm combination,
so that IMA can also verify SM2's signature data.
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
security/integrity/digsig_asymmetric.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/security/integrity/digsig_asymmetric.c b/security/integrity/digsig_asymmetric.c
index 4e0d6778277e..9350fcfb9bf2 100644
--- a/security/integrity/digsig_asymmetric.c
+++ b/security/integrity/digsig_asymmetric.c
@@ -99,14 +99,22 @@ int asymmetric_verify(struct key *keyring, const char *sig,
memset(&pks, 0, sizeof(pks));
pks.hash_algo = hash_algo_name[hdr->hash_algo];
- if (hdr->hash_algo = HASH_ALGO_STREEBOG_256 ||
- hdr->hash_algo = HASH_ALGO_STREEBOG_512) {
+ switch (hdr->hash_algo) {
+ case HASH_ALGO_STREEBOG_256:
+ case HASH_ALGO_STREEBOG_512:
/* EC-RDSA and Streebog should go together. */
pks.pkey_algo = "ecrdsa";
pks.encoding = "raw";
- } else {
+ break;
+ case HASH_ALGO_SM3_256:
+ /* SM2 and SM3 should go together. */
+ pks.pkey_algo = "sm2";
+ pks.encoding = "raw";
+ break;
+ default:
pks.pkey_algo = "rsa";
pks.encoding = "pkcs1";
+ break;
}
pks.digest = (u8 *)data;
pks.digest_size = datalen;
--
2.17.1
prev parent reply other threads:[~2020-07-09 8:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 8:40 [PATCH v5 0/8] crpyto: introduce OSCCA certificate and SM2 asymmetric algorithm Tianjia Zhang
2020-07-09 8:40 ` [PATCH v5 1/8] crypto: sm3 - export crypto_sm3_final function Tianjia Zhang
2020-07-09 8:40 ` [PATCH v5 2/8] lib/mpi: Extend the MPI library Tianjia Zhang
2020-07-10 13:12 ` Marcelo Henrique Cerri
2020-07-13 2:17 ` Tianjia Zhang
2020-07-09 8:40 ` [PATCH v5 3/8] lib/mpi: Introduce ec implementation to " Tianjia Zhang
2020-07-09 8:40 ` [PATCH v5 4/8] crypto: sm2 - introduce OSCCA SM2 asymmetric cipher algorithm Tianjia Zhang
2020-07-09 8:40 ` [PATCH v5 5/8] crypto: testmgr - support test with different ciphertext per encryption Tianjia Zhang
2020-07-09 8:40 ` [PATCH v5 6/8] X.509: support OSCCA certificate parse Tianjia Zhang
2020-07-09 8:40 ` [PATCH v5 7/8] X.509: support OSCCA sm2-with-sm3 certificate verification Tianjia Zhang
2020-07-09 8:40 ` Tianjia Zhang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200709084015.21886-9-tianjia.zhang@linux.alibaba.com \
--to=tianjia.zhang@linux.alibaba.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=gilad@benyossef.com \
--cc=herbert@gondor.apana.org.au \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=nramas@linux.microsoft.com \
--cc=pvanleeuwen@rambus.com \
--cc=serge@hallyn.com \
--cc=tusharsu@linux.microsoft.com \
--cc=vt@altlinux.org \
--cc=zhang.jia@linux.alibaba.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).