From: "Stephan Müller" <smueller@chronox.de>
To: herbert@gondor.apana.org.au
Cc: linux-crypto@vger.kernel.org,
Marcelo Cerri <marcelo.cerri@canonical.com>,
Tianjia Zhang <tianjia.zhang@linux.alibaba.com>,
ard.biesheuvel@linaro.org, nhorman@redhat.com, simo@redhat.com
Subject: [PATCH v3 4/5] crypto: DH SP800-56A rev 3 local public key validation
Date: Mon, 20 Jul 2020 19:08:52 +0200 [thread overview]
Message-ID: <7790015.T7Z3S40VBb@positron.chronox.de> (raw)
In-Reply-To: <2544426.mvXUDI8C0e@positron.chronox.de>
After the generation of a local public key, SP800-56A rev 3 section
5.6.2.1.3 mandates a validation of that key with a full validation
compliant to section 5.6.2.3.1.
Only if the full validation passes, the key is allowed to be used.
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
crypto/dh.c | 59 ++++++++++++++++++++++++++++++-----------------------
1 file changed, 34 insertions(+), 25 deletions(-)
diff --git a/crypto/dh.c b/crypto/dh.c
index f84fd50ec79b..cd4f32092e5c 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -180,32 +180,41 @@ static int dh_compute_value(struct kpp_request *req)
if (ret)
goto err_free_base;
- /* SP800-56A rev3 5.7.1.1 check: Validation of shared secret */
- if (fips_enabled && req->src) {
- MPI pone;
-
- /* z <= 1 */
- if (mpi_cmp_ui(val, 1) < 1) {
- ret = -EBADMSG;
- goto err_free_base;
- }
-
- /* z == p - 1 */
- pone = mpi_alloc(0);
-
- if (!pone) {
- ret = -ENOMEM;
- goto err_free_base;
+ if (fips_enabled) {
+ /* SP800-56A rev3 5.7.1.1 check: Validation of shared secret */
+ if (req->src) {
+ MPI pone;
+
+ /* z <= 1 */
+ if (mpi_cmp_ui(val, 1) < 1) {
+ ret = -EBADMSG;
+ goto err_free_base;
+ }
+
+ /* z == p - 1 */
+ pone = mpi_alloc(0);
+
+ if (!pone) {
+ ret = -ENOMEM;
+ goto err_free_base;
+ }
+
+ ret = mpi_sub_ui(pone, ctx->p, 1);
+ if (!ret && !mpi_cmp(pone, val))
+ ret = -EBADMSG;
+
+ mpi_free(pone);
+
+ if (ret)
+ goto err_free_base;
+
+ /* SP800-56A rev 3 5.6.2.1.3 key check */
+ } else {
+ if (dh_is_pubkey_valid(ctx, val)) {
+ ret = -EAGAIN;
+ goto err_free_val;
+ }
}
-
- ret = mpi_sub_ui(pone, ctx->p, 1);
- if (!ret && !mpi_cmp(pone, val))
- ret = -EBADMSG;
-
- mpi_free(pone);
-
- if (ret)
- goto err_free_base;
}
ret = mpi_write_to_sgl(val, req->dst, req->dst_len, &sign);
--
2.26.2
next prev parent reply other threads:[~2020-07-20 17:10 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 10:09 [PATCH 0/3] DH: SP800-56A rev 3 compliant shared secret Stephan Müller
2020-07-10 10:10 ` [PATCH 1/3] crypto: ECDH - check validity of Z before export Stephan Müller
2020-07-10 10:10 ` [PATCH 2/3] lib/mpi: Add mpi_sub_ui() Stephan Müller
2020-07-10 14:42 ` Ard Biesheuvel
2020-07-10 15:10 ` Stephan Mueller
2020-07-10 10:15 ` [PATCH 3/3] crypto: DH - check validity of Z before export Stephan Müller
2020-07-12 16:38 ` [PATCH v2 0/5] DH: SP800-56A rev 3 compliant validation checks Stephan Müller
2020-07-12 16:39 ` [PATCH v2 1/5] crypto: ECDH - check validity of Z before export Stephan Müller
2020-07-12 18:02 ` Vitaly Chikunov
2020-07-15 13:17 ` Marcelo Henrique Cerri
2020-07-12 16:39 ` [PATCH v2 2/5] lib/mpi: Add mpi_sub_ui() Stephan Müller
2020-07-16 7:30 ` Herbert Xu
2020-07-16 8:41 ` Ard Biesheuvel
2020-07-16 12:50 ` Marcelo Henrique Cerri
2020-07-16 13:09 ` Ard Biesheuvel
2020-07-16 13:41 ` Marcelo Henrique Cerri
2020-07-16 13:53 ` Ard Biesheuvel
2020-07-16 14:23 ` Marcelo Henrique Cerri
2020-07-16 14:37 ` Ard Biesheuvel
2020-07-16 14:56 ` Marcelo Henrique Cerri
2020-07-16 15:20 ` Ard Biesheuvel
2020-07-12 16:40 ` [PATCH v2 3/5] crypto: DH - check validity of Z before export Stephan Müller
2020-07-15 13:17 ` Marcelo Henrique Cerri
2020-07-12 16:40 ` [PATCH v2 4/5] crypto: DH SP800-56A rev 3 local public key validation Stephan Müller
2020-07-15 13:18 ` Marcelo Henrique Cerri
2020-07-12 16:42 ` [PATCH v2 5/5] crypto: ECDH " Stephan Müller
2020-07-12 18:06 ` Vitaly Chikunov
2020-07-13 5:04 ` Stephan Mueller
2020-07-13 5:59 ` Vitaly Chikunov
2020-07-13 6:02 ` Stephan Müller
2020-07-15 13:19 ` Marcelo Henrique Cerri
2020-07-20 17:05 ` [PATCH v3 0/5] DH: SP800-56A rev 3 compliant validation checks Stephan Müller
2020-07-20 17:07 ` [PATCH v3 1/5] crypto: ECDH - check validity of Z before export Stephan Müller
2020-07-22 13:11 ` Vitaly Chikunov
2020-07-24 17:47 ` Neil Horman
2020-07-20 17:08 ` [PATCH v3 2/5] lib/mpi: Add mpi_sub_ui() Stephan Müller
2020-07-20 17:08 ` [PATCH v3 3/5] crypto: DH - check validity of Z before export Stephan Müller
2020-07-24 18:02 ` Neil Horman
2020-07-20 17:08 ` Stephan Müller [this message]
2020-07-20 17:09 ` [PATCH v3 5/5] crypto: ECDH SP800-56A rev 3 local public key validation Stephan Müller
2020-07-21 11:35 ` [PATCH v3 0/5] DH: SP800-56A rev 3 compliant validation checks Marcelo Henrique Cerri
2020-07-31 13:29 ` 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=7790015.T7Z3S40VBb@positron.chronox.de \
--to=smueller@chronox.de \
--cc=ard.biesheuvel@linaro.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=marcelo.cerri@canonical.com \
--cc=nhorman@redhat.com \
--cc=simo@redhat.com \
--cc=tianjia.zhang@linux.alibaba.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).