c6600b8177
Resolves: RHEL-122599 Resolves: RHEL-141987 Resolves: RHEL-142009 Resolves: RHEL-142022 Resolves: RHEL-142026 Resolves: RHEL-142030 Resolves: RHEL-142034 Resolves: RHEL-142038 Resolves: RHEL-142042 Resolves: RHEL-142046 Resolves: RHEL-142050 Resolves: RHEL-142054
74 lines
2.0 KiB
Diff
74 lines
2.0 KiB
Diff
From a1ee967fae9cb6f4a06d4ffbcd62c6efd9ac05f0 Mon Sep 17 00:00:00 2001
|
|
From: Simo Sorce <simo@redhat.com>
|
|
Date: Mon, 24 Mar 2025 10:49:00 -0400
|
|
Subject: [PATCH 35/57] FIPS: DH: PCT
|
|
|
|
Signed-off-by: Simo Sorce <simo@redhat.com>
|
|
---
|
|
crypto/dh/dh_key.c | 26 ++++++++++++++++++++++++++
|
|
1 file changed, 26 insertions(+)
|
|
|
|
diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
|
|
index 2d9f7a8100..ae47dc2cd9 100644
|
|
--- a/crypto/dh/dh_key.c
|
|
+++ b/crypto/dh/dh_key.c
|
|
@@ -43,6 +43,9 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
|
|
BN_MONT_CTX *mont = NULL;
|
|
BIGNUM *z = NULL, *pminus1;
|
|
int ret = -1;
|
|
+#ifdef FIPS_MODULE
|
|
+ int validate = 0;
|
|
+#endif
|
|
|
|
if (BN_num_bits(dh->params.p) > OPENSSL_DH_MAX_MODULUS_BITS) {
|
|
ERR_raise(ERR_LIB_DH, DH_R_MODULUS_TOO_LARGE);
|
|
@@ -60,6 +63,13 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
|
|
return 0;
|
|
}
|
|
|
|
+#ifdef FIPS_MODULE
|
|
+ if (DH_check_pub_key(dh, pub_key, &validate) <= 0) {
|
|
+ ERR_raise(ERR_LIB_DH, DH_R_CHECK_PUBKEY_INVALID);
|
|
+ return 0;
|
|
+ }
|
|
+#endif
|
|
+
|
|
ctx = BN_CTX_new_ex(dh->libctx);
|
|
if (ctx == NULL)
|
|
goto err;
|
|
@@ -271,6 +281,9 @@ static int generate_key(DH *dh)
|
|
#endif
|
|
BN_CTX *ctx = NULL;
|
|
BIGNUM *pub_key = NULL, *priv_key = NULL;
|
|
+#ifdef FIPS_MODULE
|
|
+ int validate = 0;
|
|
+#endif
|
|
|
|
if (BN_num_bits(dh->params.p) > OPENSSL_DH_MAX_MODULUS_BITS) {
|
|
ERR_raise(ERR_LIB_DH, DH_R_MODULUS_TOO_LARGE);
|
|
@@ -370,8 +383,21 @@ static int generate_key(DH *dh)
|
|
if (!ossl_dh_generate_public_key(ctx, dh, priv_key, pub_key))
|
|
goto err;
|
|
|
|
+#ifdef FIPS_MODULE
|
|
+ if (DH_check_pub_key(dh, pub_key, &validate) <= 0) {
|
|
+ ERR_raise(ERR_LIB_DH, DH_R_CHECK_PUBKEY_INVALID);
|
|
+ goto err;
|
|
+ }
|
|
+#endif
|
|
+
|
|
dh->pub_key = pub_key;
|
|
dh->priv_key = priv_key;
|
|
+#ifdef FIPS_MODULE
|
|
+ if (ossl_dh_check_pairwise(dh, 0) <= 0) {
|
|
+ abort();
|
|
+ }
|
|
+#endif
|
|
+
|
|
dh->dirty_cnt++;
|
|
ok = 1;
|
|
err:
|
|
--
|
|
2.52.0
|
|
|