You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
1.8 KiB
57 lines
1.8 KiB
diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c |
|
index aef6f9b1b7..fbe2797569 100644 |
|
--- a/crypto/dh/dh_check.c |
|
+++ b/crypto/dh/dh_check.c |
|
@@ -143,7 +143,7 @@ int DH_check(const DH *dh, int *ret) |
|
#ifdef FIPS_MODULE |
|
return DH_check_params(dh, ret); |
|
#else |
|
- int ok = 0, r; |
|
+ int ok = 0, r, q_good = 0; |
|
BN_CTX *ctx = NULL; |
|
BIGNUM *t1 = NULL, *t2 = NULL; |
|
int nid = DH_get_nid((DH *)dh); |
|
@@ -172,6 +172,13 @@ int DH_check(const DH *dh, int *ret) |
|
goto err; |
|
|
|
if (dh->params.q != NULL) { |
|
+ if (BN_ucmp(dh->params.p, dh->params.q) > 0) |
|
+ q_good = 1; |
|
+ else |
|
+ *ret |= DH_CHECK_INVALID_Q_VALUE; |
|
+ } |
|
+ |
|
+ if (q_good) { |
|
if (BN_cmp(dh->params.g, BN_value_one()) <= 0) |
|
*ret |= DH_NOT_SUITABLE_GENERATOR; |
|
else if (BN_cmp(dh->params.g, dh->params.p) >= 0) |
|
diff --git a/test/dhtest.c b/test/dhtest.c |
|
index f8dd8f3aa7..d02b3b7c58 100644 |
|
--- a/test/dhtest.c |
|
+++ b/test/dhtest.c |
|
@@ -124,6 +124,15 @@ static int dh_test(void) |
|
/* We'll have a stale error on the queue from the above test so clear it */ |
|
ERR_clear_error(); |
|
|
|
+ if (!TEST_ptr(BN_copy(q, p)) || !TEST_true(BN_add(q, q, BN_value_one()))) |
|
+ goto err3; |
|
+ |
|
+ if (!TEST_true(DH_check(dh, &i))) |
|
+ goto err3; |
|
+ if (!TEST_true(i & DH_CHECK_INVALID_Q_VALUE) |
|
+ || !TEST_false(i & DH_CHECK_Q_NOT_PRIME)) |
|
+ goto err3; |
|
+ |
|
/* Modulus of size: dh check max modulus bits + 1 */ |
|
if (!TEST_true(BN_set_word(p, 1)) |
|
|| !TEST_true(BN_lshift(p, p, OPENSSL_DH_CHECK_MAX_MODULUS_BITS))) |
|
@@ -135,6 +144,9 @@ static int dh_test(void) |
|
if (!TEST_false(DH_check(dh, &i))) |
|
goto err3; |
|
|
|
+ /* We'll have a stale error on the queue from the above test so clear it */ |
|
+ ERR_clear_error(); |
|
+ |
|
/* |
|
* II) key generation |
|
*/
|
|
|