All of lore.kernel.org
 help / color / mirror / Atom feed
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, gilad@benyossef.com, pvanleeuwen@rambus.com
Cc: 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,
	linux-integrity@vger.kernel.org, zhang.jia@linux.alibaba.com,
	tianjia.zhang@linux.alibaba.com
Subject: [PATCH v4 5/8] crypto: testmgr - support test with different ciphertext per encryption
Date: Wed,  8 Jul 2020 16:28:15 +0800	[thread overview]
Message-ID: <20200708082818.5511-6-tianjia.zhang@linux.alibaba.com> (raw)
In-Reply-To: <20200708082818.5511-1-tianjia.zhang@linux.alibaba.com>

Some asymmetric algorithms will get different ciphertext after
each encryption, such as SM2, and let testmgr support the testing
of such algorithms.

In struct akcipher_testvec, set c and c_size to be empty, skip
the comparison of the ciphertext, and compare the decrypted
plaintext with m to achieve the test purpose.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
 crypto/testmgr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 6863f911fcee..0dc94461c437 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -4025,7 +4025,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
 		pr_err("alg: akcipher: %s test failed. err %d\n", op, err);
 		goto free_all;
 	}
-	if (!vecs->siggen_sigver_test) {
+	if (!vecs->siggen_sigver_test && c) {
 		if (req->dst_len != c_size) {
 			pr_err("alg: akcipher: %s test failed. Invalid output len\n",
 			       op);
@@ -4056,6 +4056,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
 		goto free_all;
 	}
 
+	if (!vecs->siggen_sigver_test && !c) {
+		c = outbuf_enc;
+		c_size = req->dst_len;
+	}
+
 	op = vecs->siggen_sigver_test ? "sign" : "decrypt";
 	if (WARN_ON(c_size > PAGE_SIZE))
 		goto free_all;
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
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, gilad@benyossef.com, pvanleeuwen@rambus.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, zhang.jia@linux.alibaba.com,
	linux-integrity@vger.kernel.org,
	linux-stm32@st-md-mailman.stormreply.com,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 5/8] crypto: testmgr - support test with different ciphertext per encryption
Date: Wed, 08 Jul 2020 08:28:15 +0000	[thread overview]
Message-ID: <20200708082818.5511-6-tianjia.zhang@linux.alibaba.com> (raw)
In-Reply-To: <20200708082818.5511-1-tianjia.zhang@linux.alibaba.com>

Some asymmetric algorithms will get different ciphertext after
each encryption, such as SM2, and let testmgr support the testing
of such algorithms.

In struct akcipher_testvec, set c and c_size to be empty, skip
the comparison of the ciphertext, and compare the decrypted
plaintext with m to achieve the test purpose.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
 crypto/testmgr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 6863f911fcee..0dc94461c437 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -4025,7 +4025,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
 		pr_err("alg: akcipher: %s test failed. err %d\n", op, err);
 		goto free_all;
 	}
-	if (!vecs->siggen_sigver_test) {
+	if (!vecs->siggen_sigver_test && c) {
 		if (req->dst_len != c_size) {
 			pr_err("alg: akcipher: %s test failed. Invalid output len\n",
 			       op);
@@ -4056,6 +4056,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
 		goto free_all;
 	}
 
+	if (!vecs->siggen_sigver_test && !c) {
+		c = outbuf_enc;
+		c_size = req->dst_len;
+	}
+
 	op = vecs->siggen_sigver_test ? "sign" : "decrypt";
 	if (WARN_ON(c_size > PAGE_SIZE))
 		goto free_all;
-- 
2.17.1

WARNING: multiple messages have this Message-ID (diff)
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, gilad@benyossef.com, pvanleeuwen@rambus.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, zhang.jia@linux.alibaba.com,
	linux-integrity@vger.kernel.org,
	linux-stm32@st-md-mailman.stormreply.com,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 5/8] crypto: testmgr - support test with different ciphertext per encryption
Date: Wed,  8 Jul 2020 16:28:15 +0800	[thread overview]
Message-ID: <20200708082818.5511-6-tianjia.zhang@linux.alibaba.com> (raw)
In-Reply-To: <20200708082818.5511-1-tianjia.zhang@linux.alibaba.com>

Some asymmetric algorithms will get different ciphertext after
each encryption, such as SM2, and let testmgr support the testing
of such algorithms.

In struct akcipher_testvec, set c and c_size to be empty, skip
the comparison of the ciphertext, and compare the decrypted
plaintext with m to achieve the test purpose.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
 crypto/testmgr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 6863f911fcee..0dc94461c437 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -4025,7 +4025,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
 		pr_err("alg: akcipher: %s test failed. err %d\n", op, err);
 		goto free_all;
 	}
-	if (!vecs->siggen_sigver_test) {
+	if (!vecs->siggen_sigver_test && c) {
 		if (req->dst_len != c_size) {
 			pr_err("alg: akcipher: %s test failed. Invalid output len\n",
 			       op);
@@ -4056,6 +4056,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
 		goto free_all;
 	}
 
+	if (!vecs->siggen_sigver_test && !c) {
+		c = outbuf_enc;
+		c_size = req->dst_len;
+	}
+
 	op = vecs->siggen_sigver_test ? "sign" : "decrypt";
 	if (WARN_ON(c_size > PAGE_SIZE))
 		goto free_all;
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-07-08  8:28 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-08  8:28 [PATCH v4 0/8] crpyto: introduce OSCCA certificate and SM2 asymmetric algorithm Tianjia Zhang
2020-07-08  8:28 ` Tianjia Zhang
2020-07-08  8:28 ` Tianjia Zhang
2020-07-08  8:28 ` [PATCH v4 1/8] crypto: sm3 - export crypto_sm3_final function Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28 ` [PATCH v4 2/8] lib/mpi: Extend the MPI library Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08 13:13   ` kernel test robot
2020-07-08  8:28 ` [PATCH v4 3/8] lib/mpi: Introduce ec implementation to " Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08 14:46   ` kernel test robot
2020-07-08  8:28 ` [PATCH v4 4/8] crypto: sm2 - introduce OSCCA SM2 asymmetric cipher algorithm Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28 ` Tianjia Zhang [this message]
2020-07-08  8:28   ` [PATCH v4 5/8] crypto: testmgr - support test with different ciphertext per encryption Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28 ` [PATCH v4 6/8] X.509: support OSCCA certificate parse Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28 ` [PATCH v4 7/8] X.509: support OSCCA sm2-with-sm3 certificate verification Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08 11:41   ` kernel test robot
2020-07-08 13:53   ` kernel test robot
2020-07-08  8:28 ` [PATCH v4 8/8] integrity: Asymmetric digsig supports SM2-with-SM3 algorithm Tianjia Zhang
2020-07-08  8:28   ` Tianjia Zhang
2020-07-08  8:28   ` 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=20200708082818.5511-6-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=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.