From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
David Howells <dhowells@redhat.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Stephan Mueller <smueller@chronox.de>,
Marcelo Henrique Cerri <marcelo.cerri@canonical.com>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Brendan Higgins <brendanhiggins@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Waiman Long <longman@redhat.com>,
Mimi Zohar <zohar@linux.ibm.com>,
Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
Colin Ian King <colin.king@canonical.com>,
Tushar Sugandhi <tusharsu@linux.microsoft.com>,
Vitaly Chikunov <vt@altlinux.org>,
"Gilad Ben-Yossef" <gilad@benyossef.com>,
Pascal van Leeuwen <pvanleeuwen@rambus.com>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
keyrings@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-security-module@vger.kernel.org
Cc: Xufeng Zhang <yunbo.xufeng@linux.alibaba.com>,
Jia Zhang <zhang.jia@linux.alibaba.com>,
Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Subject: [PATCH v6 8/8] integrity: Asymmetric digsig supports SM2-with-SM3 algorithm
Date: Thu, 3 Sep 2020 21:12:42 +0800 [thread overview]
Message-ID: <20200903131242.128665-9-tianjia.zhang@linux.alibaba.com> (raw)
In-Reply-To: <20200903131242.128665-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>
Tested-by: Xufeng Zhang <yunbo.xufeng@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 cfa4127d0518..b86a4a8f61ab 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.19.1.3.ge56e4f7
WARNING: multiple messages have this Message-ID (diff)
From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
David Howells <dhowells@redhat.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Stephan Mueller <smueller@chronox.de>,
Marcelo Henrique Cerri <marcelo.cerri@canonical.com>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Brendan Higgins <brendanhiggins@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Waiman Long <longman@redhat.com>,
Mimi Zohar <zohar@linux.ibm.com>,
Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
Colin Ian King <colin.king@canonical.com>,
Tushar Sugandhi <tusharsu@linux.microsoft.com>,
Vitaly Chikunov <vt@altlinux.org>,
Gilad Ben-Yossef <gilad@benyossef.com>,
Pascal van Leeuwen <pvanleeuwen@rambus.com>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
keyrings@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-security-module@vger.kernel.org
Cc: Xufeng Zhang <yunbo.xufeng@linux.alibaba.com>,
Tianjia Zhang <tianjia.zhang@linux.alibaba.com>,
Jia Zhang <zhang.jia@linux.alibaba.com>
Subject: [PATCH v6 8/8] integrity: Asymmetric digsig supports SM2-with-SM3 algorithm
Date: Thu, 03 Sep 2020 13:12:42 +0000 [thread overview]
Message-ID: <20200903131242.128665-9-tianjia.zhang@linux.alibaba.com> (raw)
In-Reply-To: <20200903131242.128665-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>
Tested-by: Xufeng Zhang <yunbo.xufeng@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 cfa4127d0518..b86a4a8f61ab 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.19.1.3.ge56e4f7
WARNING: multiple messages have this Message-ID (diff)
From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
David Howells <dhowells@redhat.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Stephan Mueller <smueller@chronox.de>,
Marcelo Henrique Cerri <marcelo.cerri@canonical.com>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Brendan Higgins <brendanhiggins@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Waiman Long <longman@redhat.com>,
Mimi Zohar <zohar@linux.ibm.com>,
Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
Colin Ian King <colin.king@canonical.com>,
Tushar Sugandhi <tusharsu@linux.microsoft.com>,
Vitaly Chikunov <vt@altlinux.org>,
"Gilad Ben-Yossef" <gilad@benyossef.com>,
Pascal van Leeuwen <pvanleeuwen@rambus.com>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
keyrings@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-security-module@vger.kernel.org
Cc: Xufeng Zhang <yunbo.xufeng@linux.alibaba.com>,
Tianjia Zhang <tianjia.zhang@linux.alibaba.com>,
Jia Zhang <zhang.jia@linux.alibaba.com>
Subject: [PATCH v6 8/8] integrity: Asymmetric digsig supports SM2-with-SM3 algorithm
Date: Thu, 3 Sep 2020 21:12:42 +0800 [thread overview]
Message-ID: <20200903131242.128665-9-tianjia.zhang@linux.alibaba.com> (raw)
In-Reply-To: <20200903131242.128665-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>
Tested-by: Xufeng Zhang <yunbo.xufeng@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 cfa4127d0518..b86a4a8f61ab 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.19.1.3.ge56e4f7
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-03 14:36 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 13:12 [PATCH v6 0/8] crpyto: introduce OSCCA certificate and SM2 asymmetric algorithm Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` [PATCH v6 1/8] crypto: sm3 - export crypto_sm3_final function Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` [PATCH v6 2/8] lib/mpi: Extend the MPI library Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` [PATCH v6 3/8] lib/mpi: Introduce ec implementation to " Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` [PATCH v6 4/8] crypto: sm2 - introduce OSCCA SM2 asymmetric cipher algorithm Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` [PATCH v6 5/8] crypto: testmgr - support test with different ciphertext per encryption Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-18 6:47 ` Herbert Xu
2020-09-18 6:47 ` Herbert Xu
2020-09-18 6:47 ` Herbert Xu
2020-09-18 13:34 ` Tianjia Zhang
2020-09-18 13:34 ` Tianjia Zhang
2020-09-18 13:34 ` Tianjia Zhang
2020-09-03 13:12 ` [PATCH v6 6/8] X.509: support OSCCA certificate parse Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-12 8:50 ` Vitaly Chikunov
2020-09-12 8:50 ` Vitaly Chikunov
2020-09-12 8:50 ` Vitaly Chikunov
2020-09-03 13:12 ` [PATCH v6 7/8] X.509: support OSCCA sm2-with-sm3 certificate verification Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-13 7:12 ` Gilad Ben-Yossef
2020-09-13 7:12 ` Gilad Ben-Yossef
2020-09-13 7:12 ` Gilad Ben-Yossef
2020-09-14 6:34 ` Tianjia Zhang
2020-09-14 6:34 ` Tianjia Zhang
2020-09-14 6:34 ` Tianjia Zhang
2020-09-16 8:01 ` Gilad Ben-Yossef
2020-09-16 8:01 ` Gilad Ben-Yossef
2020-09-16 8:01 ` Gilad Ben-Yossef
2020-09-03 13:12 ` Tianjia Zhang [this message]
2020-09-03 13:12 ` [PATCH v6 8/8] integrity: Asymmetric digsig supports SM2-with-SM3 algorithm Tianjia Zhang
2020-09-03 13:12 ` Tianjia Zhang
2020-09-11 19:22 ` Mimi Zohar
2020-09-11 19:22 ` Mimi Zohar
2020-09-11 19:22 ` Mimi Zohar
2020-09-12 8:36 ` Vitaly Chikunov
2020-09-12 8:36 ` Vitaly Chikunov
2020-09-12 8:36 ` Vitaly Chikunov
2020-09-11 4:24 ` [PATCH v6 0/8] crpyto: introduce OSCCA certificate and SM2 asymmetric algorithm Herbert Xu
2020-09-11 4:24 ` Herbert Xu
2020-09-11 4:24 ` Herbert Xu
2020-09-14 7:04 ` Tianjia Zhang
2020-09-14 7:04 ` Tianjia Zhang
2020-09-14 7:04 ` Tianjia Zhang
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=20200903131242.128665-9-tianjia.zhang@linux.alibaba.com \
--to=tianjia.zhang@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=alexandre.torgue@st.com \
--cc=brendanhiggins@google.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=gilad@benyossef.com \
--cc=hannes@cmpxchg.org \
--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-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=longman@redhat.com \
--cc=marcelo.cerri@canonical.com \
--cc=masahiroy@kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=nramas@linux.microsoft.com \
--cc=pvanleeuwen@rambus.com \
--cc=rostedt@goodmis.org \
--cc=serge@hallyn.com \
--cc=smueller@chronox.de \
--cc=tusharsu@linux.microsoft.com \
--cc=vt@altlinux.org \
--cc=yunbo.xufeng@linux.alibaba.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.