mirror of
https://github.com/openssl/openssl.git
synced 2025-01-30 14:01:55 +08:00
b305452f69
The KEYMGMT libcrypto <-> provider interface currently makes a few assumptions: 1. provider side domain parameters and key data isn't mutable. In other words, as soon as a key has been created in any (loaded, imported data, ...), it's set in stone. 2. provider side domain parameters can be strictly separated from the key data. This does work for the most part, but there are places where that's a bit too rigid for the functionality that the EVP_PKEY API delivers. Key data needs to be mutable to allow the flexibility that functions like EVP_PKEY_copy_parameters promise, as well as to provide the combinations of data that an EVP_PKEY is generally assumed to be able to hold: - domain parameters only - public key only - public key + private key - domain parameters + public key - domain parameters + public key + private key To remedy all this, we: 1. let go of the distinction between domain parameters and key material proper in the libcrypto <-> provider interface. As a consequence, functions that still need it gain a selection argument, which is a set of bits that indicate what parts of the key object are to be considered in a specific call. This allows a reduction of very similar functions into one. 2. Rework the libcrypto <-> provider interface so provider side key objects are created and destructed with a separate function, and get their data filled and extracted in through import and export. (future work will see other key object constructors and other functions to fill them with data) Fixes #10979 squash! Redesign the KEYMGMT libcrypto <-> provider interface - the basics Remedy 1 needs a rewrite: Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/11006)
324 lines
6.9 KiB
C
324 lines
6.9 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
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include "internal/cryptlib.h"
|
|
#include "internal/refcount.h"
|
|
#include <openssl/bn.h>
|
|
#include <openssl/asn1.h>
|
|
#include <openssl/engine.h>
|
|
#include "dsa_local.h"
|
|
#include "crypto/dsa.h"
|
|
#include "crypto/dh.h" /* required by DSA_dup_DH() */
|
|
|
|
#ifndef FIPS_MODE
|
|
|
|
int DSA_set_ex_data(DSA *d, int idx, void *arg)
|
|
{
|
|
return CRYPTO_set_ex_data(&d->ex_data, idx, arg);
|
|
}
|
|
|
|
void *DSA_get_ex_data(DSA *d, int idx)
|
|
{
|
|
return CRYPTO_get_ex_data(&d->ex_data, idx);
|
|
}
|
|
|
|
# ifndef OPENSSL_NO_DH
|
|
DH *DSA_dup_DH(const DSA *r)
|
|
{
|
|
/*
|
|
* DSA has p, q, g, optional pub_key, optional priv_key.
|
|
* DH has p, optional length, g, optional pub_key,
|
|
* optional priv_key, optional q.
|
|
*/
|
|
DH *ret = NULL;
|
|
BIGNUM *pub_key = NULL, *priv_key = NULL;
|
|
|
|
if (r == NULL)
|
|
goto err;
|
|
ret = DH_new();
|
|
if (ret == NULL)
|
|
goto err;
|
|
|
|
if (!ffc_params_copy(dh_get0_params(ret), &r->params))
|
|
goto err;
|
|
|
|
if (r->pub_key != NULL) {
|
|
pub_key = BN_dup(r->pub_key);
|
|
if (pub_key == NULL)
|
|
goto err;
|
|
if (r->priv_key != NULL) {
|
|
priv_key = BN_dup(r->priv_key);
|
|
if (priv_key == NULL)
|
|
goto err;
|
|
}
|
|
if (!DH_set0_key(ret, pub_key, priv_key))
|
|
goto err;
|
|
} else if (r->priv_key != NULL) {
|
|
/* Shouldn't happen */
|
|
goto err;
|
|
}
|
|
|
|
return ret;
|
|
|
|
err:
|
|
BN_free(pub_key);
|
|
BN_free(priv_key);
|
|
DH_free(ret);
|
|
return NULL;
|
|
}
|
|
# endif /* OPENSSL_NO_DH */
|
|
|
|
void DSA_clear_flags(DSA *d, int flags)
|
|
{
|
|
d->flags &= ~flags;
|
|
}
|
|
|
|
int DSA_test_flags(const DSA *d, int flags)
|
|
{
|
|
return d->flags & flags;
|
|
}
|
|
|
|
void DSA_set_flags(DSA *d, int flags)
|
|
{
|
|
d->flags |= flags;
|
|
}
|
|
|
|
ENGINE *DSA_get0_engine(DSA *d)
|
|
{
|
|
return d->engine;
|
|
}
|
|
|
|
int DSA_set_method(DSA *dsa, const DSA_METHOD *meth)
|
|
{
|
|
/*
|
|
* NB: The caller is specifically setting a method, so it's not up to us
|
|
* to deal with which ENGINE it comes from.
|
|
*/
|
|
const DSA_METHOD *mtmp;
|
|
mtmp = dsa->meth;
|
|
if (mtmp->finish)
|
|
mtmp->finish(dsa);
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
ENGINE_finish(dsa->engine);
|
|
dsa->engine = NULL;
|
|
#endif
|
|
dsa->meth = meth;
|
|
if (meth->init)
|
|
meth->init(dsa);
|
|
return 1;
|
|
}
|
|
#endif /* FIPS_MODE */
|
|
|
|
|
|
const DSA_METHOD *DSA_get_method(DSA *d)
|
|
{
|
|
return d->meth;
|
|
}
|
|
|
|
static DSA *dsa_new_method(OPENSSL_CTX *libctx, ENGINE *engine)
|
|
{
|
|
DSA *ret = OPENSSL_zalloc(sizeof(*ret));
|
|
|
|
if (ret == NULL) {
|
|
DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
|
|
return NULL;
|
|
}
|
|
|
|
ret->references = 1;
|
|
ret->lock = CRYPTO_THREAD_lock_new();
|
|
if (ret->lock == NULL) {
|
|
DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
|
|
OPENSSL_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
ret->meth = DSA_get_default_method();
|
|
#if !defined(FIPS_MODE) && !defined(OPENSSL_NO_ENGINE)
|
|
ret->flags = ret->meth->flags & ~DSA_FLAG_NON_FIPS_ALLOW; /* early default init */
|
|
if (engine) {
|
|
if (!ENGINE_init(engine)) {
|
|
DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_ENGINE_LIB);
|
|
goto err;
|
|
}
|
|
ret->engine = engine;
|
|
} else
|
|
ret->engine = ENGINE_get_default_DSA();
|
|
if (ret->engine) {
|
|
ret->meth = ENGINE_get_DSA(ret->engine);
|
|
if (ret->meth == NULL) {
|
|
DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_ENGINE_LIB);
|
|
goto err;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
ret->flags = ret->meth->flags & ~DSA_FLAG_NON_FIPS_ALLOW;
|
|
|
|
#ifndef FIPS_MODE
|
|
if (!crypto_new_ex_data_ex(libctx, CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data))
|
|
goto err;
|
|
#endif
|
|
|
|
if ((ret->meth->init != NULL) && !ret->meth->init(ret)) {
|
|
DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_INIT_FAIL);
|
|
goto err;
|
|
}
|
|
|
|
return ret;
|
|
|
|
err:
|
|
DSA_free(ret);
|
|
return NULL;
|
|
}
|
|
|
|
DSA *DSA_new_method(ENGINE *engine)
|
|
{
|
|
return dsa_new_method(NULL, engine);
|
|
}
|
|
|
|
DSA *DSA_new(void)
|
|
{
|
|
return DSA_new_method(NULL);
|
|
}
|
|
|
|
void DSA_free(DSA *r)
|
|
{
|
|
int i;
|
|
|
|
if (r == NULL)
|
|
return;
|
|
|
|
CRYPTO_DOWN_REF(&r->references, &i, r->lock);
|
|
REF_PRINT_COUNT("DSA", r);
|
|
if (i > 0)
|
|
return;
|
|
REF_ASSERT_ISNT(i < 0);
|
|
|
|
if (r->meth != NULL && r->meth->finish != NULL)
|
|
r->meth->finish(r);
|
|
#if !defined(FIPS_MODE) && !defined(OPENSSL_NO_ENGINE)
|
|
ENGINE_finish(r->engine);
|
|
#endif
|
|
|
|
#ifndef FIPS_MODE
|
|
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, r, &r->ex_data);
|
|
#endif
|
|
|
|
CRYPTO_THREAD_lock_free(r->lock);
|
|
|
|
ffc_params_cleanup(&r->params);
|
|
BN_clear_free(r->pub_key);
|
|
BN_clear_free(r->priv_key);
|
|
OPENSSL_free(r);
|
|
}
|
|
|
|
int DSA_up_ref(DSA *r)
|
|
{
|
|
int i;
|
|
|
|
if (CRYPTO_UP_REF(&r->references, &i, r->lock) <= 0)
|
|
return 0;
|
|
|
|
REF_PRINT_COUNT("DSA", r);
|
|
REF_ASSERT_ISNT(i < 2);
|
|
return ((i > 1) ? 1 : 0);
|
|
}
|
|
|
|
void DSA_get0_pqg(const DSA *d,
|
|
const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
|
|
{
|
|
ffc_params_get0_pqg(&d->params, p, q, g);
|
|
}
|
|
|
|
int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
|
|
{
|
|
/* If the fields p, q and g in d are NULL, the corresponding input
|
|
* parameters MUST be non-NULL.
|
|
*/
|
|
if ((d->params.p == NULL && p == NULL)
|
|
|| (d->params.q == NULL && q == NULL)
|
|
|| (d->params.g == NULL && g == NULL))
|
|
return 0;
|
|
|
|
ffc_params_set0_pqg(&d->params, p, q, g);
|
|
d->dirty_cnt++;
|
|
|
|
return 1;
|
|
}
|
|
|
|
const BIGNUM *DSA_get0_p(const DSA *d)
|
|
{
|
|
return d->params.p;
|
|
}
|
|
|
|
const BIGNUM *DSA_get0_q(const DSA *d)
|
|
{
|
|
return d->params.q;
|
|
}
|
|
|
|
const BIGNUM *DSA_get0_g(const DSA *d)
|
|
{
|
|
return d->params.g;
|
|
}
|
|
|
|
const BIGNUM *DSA_get0_pub_key(const DSA *d)
|
|
{
|
|
return d->pub_key;
|
|
}
|
|
|
|
const BIGNUM *DSA_get0_priv_key(const DSA *d)
|
|
{
|
|
return d->priv_key;
|
|
}
|
|
|
|
void DSA_get0_key(const DSA *d,
|
|
const BIGNUM **pub_key, const BIGNUM **priv_key)
|
|
{
|
|
if (pub_key != NULL)
|
|
*pub_key = d->pub_key;
|
|
if (priv_key != NULL)
|
|
*priv_key = d->priv_key;
|
|
}
|
|
|
|
int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key)
|
|
{
|
|
/* If the field pub_key in d is NULL, the corresponding input
|
|
* parameters MUST be non-NULL. The priv_key field may
|
|
* be left NULL.
|
|
*/
|
|
if (d->pub_key == NULL && pub_key == NULL)
|
|
return 0;
|
|
|
|
if (pub_key != NULL) {
|
|
BN_free(d->pub_key);
|
|
d->pub_key = pub_key;
|
|
}
|
|
if (priv_key != NULL) {
|
|
BN_free(d->priv_key);
|
|
d->priv_key = priv_key;
|
|
}
|
|
d->dirty_cnt++;
|
|
|
|
return 1;
|
|
}
|
|
|
|
int DSA_security_bits(const DSA *d)
|
|
{
|
|
if (d->params.p != NULL && d->params.q != NULL)
|
|
return BN_security_bits(BN_num_bits(d->params.p),
|
|
BN_num_bits(d->params.q));
|
|
return -1;
|
|
}
|
|
|
|
int DSA_bits(const DSA *dsa)
|
|
{
|
|
return BN_num_bits(dsa->params.p);
|
|
}
|