8b84b075ff
The biggest part in this was to move the key->param builder from EVP to the DH ASN.1 method, and to implement the KEYMGMT support in the provider DH. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9394)
88 lines
2.5 KiB
C
88 lines
2.5 KiB
C
/*
|
|
* Copyright 2019 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 <openssl/core_numbers.h>
|
|
#include <openssl/core_names.h>
|
|
#include <openssl/bn.h>
|
|
#include <openssl/dh.h>
|
|
#include <openssl/params.h>
|
|
#include "internal/provider_algs.h"
|
|
|
|
static OSSL_OP_keymgmt_importkey_fn dh_importkey;
|
|
|
|
static int params_to_key(DH *dh, const OSSL_PARAM params[])
|
|
{
|
|
const OSSL_PARAM *param_p, *param_g, *param_priv_key, *param_pub_key;
|
|
BIGNUM *p = NULL, *g = NULL, *priv_key = NULL, *pub_key = NULL;
|
|
|
|
if (dh == NULL)
|
|
return 0;
|
|
|
|
param_p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_P);
|
|
param_g = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_G);
|
|
param_priv_key =
|
|
OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_PRIV_KEY);
|
|
param_pub_key =
|
|
OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_PUB_KEY);
|
|
|
|
/*
|
|
* DH documentation says that a public key must be present if a
|
|
* private key is present.
|
|
* We want to have at least a public key either way, so we end up
|
|
* requiring it unconditionally.
|
|
*/
|
|
if (param_pub_key == NULL)
|
|
return 0;
|
|
|
|
if ((param_p != NULL && !OSSL_PARAM_get_BN(param_p, &p))
|
|
|| (param_g != NULL && !OSSL_PARAM_get_BN(param_g, &g))
|
|
|| (param_priv_key != NULL
|
|
&& !OSSL_PARAM_get_BN(param_priv_key, &priv_key))
|
|
|| !OSSL_PARAM_get_BN(param_pub_key, &pub_key))
|
|
goto err;
|
|
|
|
if (!DH_set0_pqg(dh, p, NULL, g))
|
|
goto err;
|
|
p = g = NULL;
|
|
|
|
if (!DH_set0_key(dh, pub_key, priv_key))
|
|
goto err;
|
|
priv_key = pub_key = NULL;
|
|
|
|
return 1;
|
|
|
|
err:
|
|
BN_free(p);
|
|
BN_free(g);
|
|
BN_free(priv_key);
|
|
BN_free(pub_key);
|
|
return 0;
|
|
}
|
|
|
|
static void *dh_importkey(void *provctx, const OSSL_PARAM params[])
|
|
{
|
|
DH *dh;
|
|
|
|
if ((dh = DH_new()) == NULL
|
|
|| !params_to_key(dh, params)) {
|
|
DH_free(dh);
|
|
dh = NULL;
|
|
}
|
|
return dh;
|
|
}
|
|
|
|
const OSSL_DISPATCH dh_keymgmt_functions[] = {
|
|
/*
|
|
* TODO(3.0) When implementing OSSL_FUNC_KEYMGMT_GENKEY, remember to also
|
|
* implement OSSL_FUNC_KEYMGMT_EXPORTKEY.
|
|
*/
|
|
{ OSSL_FUNC_KEYMGMT_IMPORTKEY, (void (*)(void))dh_importkey },
|
|
{ OSSL_FUNC_KEYMGMT_FREEKEY, (void (*)(void))DH_free },
|
|
{ 0, NULL }
|
|
};
|