From: Vitaly Chikunov <vt@altlinux.org>
To: Herbert Xu <herbert@gondor.apana.org.au>,
David Howells <dhowells@redhat.com>,
Mimi Zohar <zohar@linux.ibm.com>,
linux-integrity@vger.kernel.org, keyrings@vger.kernel.org,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 02/10] crypto: akcipher - check the presence of callback before the call
Date: Sun, 24 Feb 2019 09:08:20 +0300 [thread overview]
Message-ID: <20190224060828.2527-3-vt@altlinux.org> (raw)
In-Reply-To: <20190224060828.2527-1-vt@altlinux.org>
Because with introduction of EC-RDSA and change in workings of RSA in
regard to sign/verify, akcipher could have not all callbacks defined,
check the presence of callbacks before calling them to increase
robustness.
Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
---
include/crypto/akcipher.h | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/include/crypto/akcipher.h b/include/crypto/akcipher.h
index 2d690494568c..f537fad1989f 100644
--- a/include/crypto/akcipher.h
+++ b/include/crypto/akcipher.h
@@ -268,7 +268,10 @@ static inline unsigned int crypto_akcipher_maxsize(struct crypto_akcipher *tfm)
{
struct akcipher_alg *alg = crypto_akcipher_alg(tfm);
- return alg->max_size(tfm);
+ if (alg->max_size)
+ return alg->max_size(tfm);
+ else
+ return 0;
}
/**
@@ -287,10 +290,11 @@ static inline int crypto_akcipher_encrypt(struct akcipher_request *req)
struct akcipher_alg *alg = crypto_akcipher_alg(tfm);
struct crypto_alg *calg = tfm->base.__crt_alg;
unsigned int src_len = req->src_len;
- int ret;
+ int ret = -ENOSYS;
crypto_stats_get(calg);
- ret = alg->encrypt(req);
+ if (alg->encrypt)
+ ret = alg->encrypt(req);
crypto_stats_akcipher_encrypt(src_len, ret, calg);
return ret;
}
@@ -311,10 +315,11 @@ static inline int crypto_akcipher_decrypt(struct akcipher_request *req)
struct akcipher_alg *alg = crypto_akcipher_alg(tfm);
struct crypto_alg *calg = tfm->base.__crt_alg;
unsigned int src_len = req->src_len;
- int ret;
+ int ret = -ENOSYS;
crypto_stats_get(calg);
- ret = alg->decrypt(req);
+ if (alg->decrypt)
+ ret = alg->decrypt(req);
crypto_stats_akcipher_decrypt(src_len, ret, calg);
return ret;
}
@@ -334,10 +339,11 @@ static inline int crypto_akcipher_sign(struct akcipher_request *req)
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
struct akcipher_alg *alg = crypto_akcipher_alg(tfm);
struct crypto_alg *calg = tfm->base.__crt_alg;
- int ret;
+ int ret = -ENOSYS;
crypto_stats_get(calg);
- ret = alg->sign(req);
+ if (alg->sign)
+ ret = alg->sign(req);
crypto_stats_akcipher_sign(ret, calg);
return ret;
}
@@ -357,10 +363,11 @@ static inline int crypto_akcipher_verify(struct akcipher_request *req)
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
struct akcipher_alg *alg = crypto_akcipher_alg(tfm);
struct crypto_alg *calg = tfm->base.__crt_alg;
- int ret;
+ int ret = -ENOSYS;
crypto_stats_get(calg);
- ret = alg->verify(req);
+ if (alg->verify)
+ ret = alg->verify(req);
crypto_stats_akcipher_verify(ret, calg);
return ret;
}
--
2.11.0
next prev parent reply other threads:[~2019-02-24 6:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-24 6:08 [PATCH v5 00/10] crypto: add EC-RDSA (GOST 34.10) algorithm Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 01/10] KEYS: report to keyctl only actually supported key ops Vitaly Chikunov
2019-02-24 6:08 ` Vitaly Chikunov [this message]
2019-02-24 6:08 ` [PATCH v5 03/10] crypto: rsa - unimplement sign/verify for raw RSA backends Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 04/10] crypto: akcipher - new verify API for public key algorithms Vitaly Chikunov
2019-02-27 23:28 ` Mimi Zohar
2019-02-28 5:37 ` Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 05/10] X.509: parse public key parameters from x509 for akcipher Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 06/10] crypto: Kconfig - create Public-key cryptography section Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 07/10] crypto: ecc - make ecc into separate module Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 08/10] crypto: ecrdsa - add EC-RDSA (GOST 34.10) algorithm Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 09/10] crypto: ecrdsa - add EC-RDSA test vectors to testmgr Vitaly Chikunov
2019-02-24 6:08 ` [PATCH v5 10/10] integrity: support EC-RDSA signatures for asymmetric_verify Vitaly Chikunov
2019-02-25 21:20 ` Thiago Jung Bauermann
2019-02-26 4:25 ` Vitaly Chikunov
2019-02-26 12:07 ` Mimi Zohar
2019-02-28 18:18 ` [PATCH v5 04/10] crypto: akcipher - new verify API for public key algorithms David Howells
2019-02-28 18:39 ` Vitaly Chikunov
2019-02-28 19:02 ` David Howells
2019-02-28 19:07 ` Vitaly Chikunov
2019-03-01 2:34 ` Herbert Xu
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=20190224060828.2527-3-vt@altlinux.org \
--to=vt@altlinux.org \
--cc=dhowells@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).