mirror of
https://github.com/openssl/openssl.git
synced 2024-12-03 05:41:46 +08:00
63794b048c
Fixes #11864 - The dsa keygen assumed valid p, q, g values were being passed. If this is not correct then it is possible that dsa keygen can either hang or segfault. The fix was to do a partial validation of p, q, and g inside the keygen. - Fixed a potential double free in the dsa keypair test in the case when in failed (It should never fail!). It freed internal object members without setting them to NULL. - Changed the FFC key validation to accept 1024 bit keys in non fips mode. - Added tests that use both the default provider & fips provider to test these cases. Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/12176)
171 lines
4.1 KiB
C
171 lines
4.1 KiB
C
/*
|
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
/*
|
|
* DSA low level APIs are deprecated for public use, but still ok for
|
|
* internal use.
|
|
*/
|
|
#include "internal/deprecated.h"
|
|
|
|
#include <stdio.h>
|
|
#include <time.h>
|
|
#include "internal/cryptlib.h"
|
|
#include <openssl/bn.h>
|
|
#include <openssl/self_test.h>
|
|
#include "crypto/dsa.h"
|
|
#include "dsa_local.h"
|
|
|
|
#ifdef FIPS_MODULE
|
|
# define MIN_STRENGTH 112
|
|
#else
|
|
# define MIN_STRENGTH 80
|
|
#endif
|
|
|
|
static int dsa_keygen(DSA *dsa, int pairwise_test);
|
|
static int dsa_keygen_pairwise_test(DSA *dsa, OSSL_CALLBACK *cb, void *cbarg);
|
|
|
|
int DSA_generate_key(DSA *dsa)
|
|
{
|
|
#ifndef FIPS_MODULE
|
|
if (dsa->meth->dsa_keygen != NULL)
|
|
return dsa->meth->dsa_keygen(dsa);
|
|
#endif
|
|
return dsa_keygen(dsa, 0);
|
|
}
|
|
|
|
int dsa_generate_public_key(BN_CTX *ctx, const DSA *dsa, const BIGNUM *priv_key,
|
|
BIGNUM *pub_key)
|
|
{
|
|
int ret = 0;
|
|
BIGNUM *prk = BN_new();
|
|
|
|
if (prk == NULL)
|
|
return 0;
|
|
BN_with_flags(prk, priv_key, BN_FLG_CONSTTIME);
|
|
|
|
/* pub_key = g ^ priv_key mod p */
|
|
if (!BN_mod_exp(pub_key, dsa->params.g, prk, dsa->params.p, ctx))
|
|
goto err;
|
|
ret = 1;
|
|
err:
|
|
BN_clear_free(prk);
|
|
return ret;
|
|
}
|
|
|
|
static int dsa_keygen(DSA *dsa, int pairwise_test)
|
|
{
|
|
int ok = 0;
|
|
BN_CTX *ctx = NULL;
|
|
BIGNUM *pub_key = NULL, *priv_key = NULL;
|
|
|
|
if ((ctx = BN_CTX_new_ex(dsa->libctx)) == NULL)
|
|
goto err;
|
|
|
|
if (dsa->priv_key == NULL) {
|
|
if ((priv_key = BN_secure_new()) == NULL)
|
|
goto err;
|
|
} else {
|
|
priv_key = dsa->priv_key;
|
|
}
|
|
|
|
/* Do a partial check for invalid p, q, g */
|
|
if (!ffc_params_simple_validate(dsa->libctx, &dsa->params,
|
|
FFC_PARAM_TYPE_DSA))
|
|
goto err;
|
|
|
|
/*
|
|
* For FFC FIPS 186-4 keygen
|
|
* security strength s = 112,
|
|
* Max Private key size N = len(q)
|
|
*/
|
|
if (!ffc_generate_private_key(ctx, &dsa->params, BN_num_bits(dsa->params.q),
|
|
MIN_STRENGTH, priv_key))
|
|
goto err;
|
|
|
|
if (dsa->pub_key == NULL) {
|
|
if ((pub_key = BN_new()) == NULL)
|
|
goto err;
|
|
} else {
|
|
pub_key = dsa->pub_key;
|
|
}
|
|
|
|
if (!dsa_generate_public_key(ctx, dsa, priv_key, pub_key))
|
|
goto err;
|
|
|
|
dsa->priv_key = priv_key;
|
|
dsa->pub_key = pub_key;
|
|
|
|
#ifdef FIPS_MODULE
|
|
pairwise_test = 1;
|
|
#endif /* FIPS_MODULE */
|
|
|
|
ok = 1;
|
|
if (pairwise_test) {
|
|
OSSL_CALLBACK *cb = NULL;
|
|
void *cbarg = NULL;
|
|
|
|
OSSL_SELF_TEST_get_callback(dsa->libctx, &cb, &cbarg);
|
|
ok = dsa_keygen_pairwise_test(dsa, cb, cbarg);
|
|
if (!ok) {
|
|
BN_free(dsa->pub_key);
|
|
BN_clear_free(dsa->priv_key);
|
|
dsa->pub_key = NULL;
|
|
dsa->priv_key = NULL;
|
|
BN_CTX_free(ctx);
|
|
return ok;
|
|
}
|
|
}
|
|
dsa->dirty_cnt++;
|
|
|
|
err:
|
|
if (pub_key != dsa->pub_key)
|
|
BN_free(pub_key);
|
|
if (priv_key != dsa->priv_key)
|
|
BN_free(priv_key);
|
|
BN_CTX_free(ctx);
|
|
|
|
return ok;
|
|
}
|
|
|
|
/*
|
|
* FIPS 140-2 IG 9.9 AS09.33
|
|
* Perform a sign/verify operation.
|
|
*/
|
|
static int dsa_keygen_pairwise_test(DSA *dsa, OSSL_CALLBACK *cb, void *cbarg)
|
|
{
|
|
int ret = 0;
|
|
unsigned char dgst[16] = {0};
|
|
unsigned int dgst_len = (unsigned int)sizeof(dgst);
|
|
DSA_SIG *sig = NULL;
|
|
OSSL_SELF_TEST *st = NULL;
|
|
|
|
st = OSSL_SELF_TEST_new(cb, cbarg);
|
|
if (st == NULL)
|
|
goto err;
|
|
|
|
OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
|
|
OSSL_SELF_TEST_DESC_PCT_DSA);
|
|
|
|
sig = DSA_do_sign(dgst, (int)dgst_len, dsa);
|
|
if (sig == NULL)
|
|
goto err;
|
|
|
|
OSSL_SELF_TEST_oncorrupt_byte(st, dgst);
|
|
|
|
if (DSA_do_verify(dgst, dgst_len, sig, dsa) != 1)
|
|
goto err;
|
|
|
|
ret = 1;
|
|
err:
|
|
OSSL_SELF_TEST_onend(st, ret);
|
|
OSSL_SELF_TEST_free(st);
|
|
DSA_SIG_free(sig);
|
|
return ret;
|
|
}
|