2020-03-23 12:40:47 +08:00
|
|
|
/*
|
2021-01-28 20:54:57 +08:00
|
|
|
* Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
|
2020-03-23 12:40:47 +08:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
2020-10-16 16:36:19 +08:00
|
|
|
/*
|
|
|
|
* DH low level APIs are deprecated for public use, but still ok for
|
|
|
|
* internal use.
|
|
|
|
*/
|
|
|
|
#include "internal/deprecated.h"
|
|
|
|
|
2020-03-23 12:40:47 +08:00
|
|
|
#include <openssl/core_names.h>
|
2020-10-15 13:10:29 +08:00
|
|
|
#include "internal/param_build_set.h"
|
2020-03-23 12:40:47 +08:00
|
|
|
#include "crypto/dh.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The intention with the "backend" source file is to offer backend functions
|
|
|
|
* for legacy backends (EVP_PKEY_ASN1_METHOD and EVP_PKEY_METHOD) and provider
|
|
|
|
* implementations alike.
|
|
|
|
*/
|
|
|
|
|
2020-10-15 13:10:29 +08:00
|
|
|
static int dh_ffc_params_fromdata(DH *dh, const OSSL_PARAM params[])
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
FFC_PARAMS *ffc;
|
|
|
|
|
|
|
|
if (dh == NULL)
|
|
|
|
return 0;
|
Fix external symbols related to dh keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
2021-02-18 13:56:53 +08:00
|
|
|
ffc = ossl_dh_get0_params(dh);
|
2020-10-15 13:10:29 +08:00
|
|
|
if (ffc == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = ossl_ffc_params_fromdata(ffc, params);
|
|
|
|
if (ret)
|
Fix external symbols related to dh keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
2021-02-18 13:56:53 +08:00
|
|
|
ossl_dh_cache_named_group(dh); /* This increments dh->dirty_cnt */
|
2020-10-15 13:10:29 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
Fix external symbols related to dh keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
2021-02-18 13:56:53 +08:00
|
|
|
int ossl_dh_params_fromdata(DH *dh, const OSSL_PARAM params[])
|
2020-10-15 13:10:29 +08:00
|
|
|
{
|
|
|
|
const OSSL_PARAM *param_priv_len;
|
|
|
|
long priv_len;
|
|
|
|
|
|
|
|
if (!dh_ffc_params_fromdata(dh, params))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
param_priv_len =
|
|
|
|
OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_PRIV_LEN);
|
|
|
|
if (param_priv_len != NULL
|
|
|
|
&& (!OSSL_PARAM_get_long(param_priv_len, &priv_len)
|
|
|
|
|| !DH_set_length(dh, priv_len)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
Fix external symbols related to dh keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
2021-02-18 13:56:53 +08:00
|
|
|
int ossl_dh_key_fromdata(DH *dh, const OSSL_PARAM params[])
|
2020-03-23 12:40:47 +08:00
|
|
|
{
|
|
|
|
const OSSL_PARAM *param_priv_key, *param_pub_key;
|
|
|
|
BIGNUM *priv_key = NULL, *pub_key = NULL;
|
|
|
|
|
|
|
|
if (dh == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2020-04-15 23:14:00 +08:00
|
|
|
param_priv_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
|
|
|
|
param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
|
2020-03-23 12:40:47 +08:00
|
|
|
|
|
|
|
if ((param_priv_key != NULL
|
|
|
|
&& !OSSL_PARAM_get_BN(param_priv_key, &priv_key))
|
|
|
|
|| (param_pub_key != NULL
|
|
|
|
&& !OSSL_PARAM_get_BN(param_pub_key, &pub_key)))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!DH_set0_key(dh, pub_key, priv_key))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
err:
|
|
|
|
BN_clear_free(priv_key);
|
|
|
|
BN_free(pub_key);
|
|
|
|
return 0;
|
|
|
|
}
|
2020-10-15 13:10:29 +08:00
|
|
|
|
Fix external symbols related to dh keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
2021-02-18 13:56:53 +08:00
|
|
|
int ossl_dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[])
|
2020-10-15 13:10:29 +08:00
|
|
|
{
|
|
|
|
long l = DH_get_length(dh);
|
|
|
|
|
Fix external symbols related to dh keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
2021-02-18 13:56:53 +08:00
|
|
|
if (!ossl_ffc_params_todata(ossl_dh_get0_params(dh), bld, params))
|
2020-10-15 13:10:29 +08:00
|
|
|
return 0;
|
|
|
|
if (l > 0
|
|
|
|
&& !ossl_param_build_set_long(bld, params, OSSL_PKEY_PARAM_DH_PRIV_LEN, l))
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
Fix external symbols related to dh keys
Partial fix for #12964
This adds ossl_ names for the following symbols:
dh_new_by_nid_ex, dh_new_ex, dh_generate_ffc_parameters, dh_generate_public_key,
dh_get_named_group_uid_from_size, dh_gen_type_id2name, dh_gen_type_name2id,
dh_cache_named_group, dh_get0_params, dh_get0_nid,
dh_params_fromdata, dh_key_fromdata, dh_params_todata, dh_key_todata,
dh_check_pub_key_partial, dh_check_priv_key, dh_check_pairwise,
dh_get_method, dh_buf2key, dh_key2buf, dh_KDF_X9_42_asn1,
dh_pkey_method, dhx_pkey_method
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14231)
2021-02-18 13:56:53 +08:00
|
|
|
int ossl_dh_key_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[])
|
2020-10-15 13:10:29 +08:00
|
|
|
{
|
|
|
|
const BIGNUM *priv = NULL, *pub = NULL;
|
|
|
|
|
|
|
|
if (dh == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
DH_get0_key(dh, &pub, &priv);
|
|
|
|
if (priv != NULL
|
|
|
|
&& !ossl_param_build_set_bn(bld, params, OSSL_PKEY_PARAM_PRIV_KEY, priv))
|
|
|
|
return 0;
|
|
|
|
if (pub != NULL
|
|
|
|
&& !ossl_param_build_set_bn(bld, params, OSSL_PKEY_PARAM_PUB_KEY, pub))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|