mirror of
https://github.com/openssl/openssl.git
synced 2024-12-21 06:09:35 +08:00
c829c23b67
EVP_PKEY_CTX_set_dh_ functions were only available when DH was enabled
('no-dsa' not configured). However, that makes it impossible to use
these functions with an engine or a provider that happens to implement
DH. This change solves that problem by shuffling these functions to
more appropriate places.
By consequence, there are a number of places where we can remove the
check of OPENSSL_NO_DH. This requires some re-arrangements of
internal tables to translate between numeric identities and names.
Partially fixes #13550
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13589)
48 lines
1.9 KiB
C
48 lines
1.9 KiB
C
/*
|
|
* Copyright 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 <openssl/core.h>
|
|
#include <openssl/params.h>
|
|
#include <openssl/dh.h>
|
|
#include "internal/ffc.h"
|
|
|
|
DH *dh_new_by_nid_ex(OSSL_LIB_CTX *libctx, int nid);
|
|
DH *dh_new_ex(OSSL_LIB_CTX *libctx);
|
|
|
|
int dh_generate_ffc_parameters(DH *dh, int type, int pbits, int qbits,
|
|
BN_GENCB *cb);
|
|
int dh_generate_public_key(BN_CTX *ctx, const DH *dh, const BIGNUM *priv_key,
|
|
BIGNUM *pub_key);
|
|
int dh_get_named_group_uid_from_size(int pbits);
|
|
const char *dh_gen_type_id2name(int id);
|
|
int dh_gen_type_name2id(const char *name);
|
|
void dh_cache_named_group(DH *dh);
|
|
|
|
FFC_PARAMS *dh_get0_params(DH *dh);
|
|
int dh_get0_nid(const DH *dh);
|
|
int dh_params_fromdata(DH *dh, const OSSL_PARAM params[]);
|
|
int dh_key_fromdata(DH *dh, const OSSL_PARAM params[]);
|
|
int dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]);
|
|
int dh_key_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]);
|
|
|
|
int dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret);
|
|
int dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret);
|
|
int dh_check_pairwise(const DH *dh);
|
|
|
|
const DH_METHOD *dh_get_method(const DH *dh);
|
|
|
|
int dh_buf2key(DH *key, const unsigned char *buf, size_t len);
|
|
size_t dh_key2buf(const DH *dh, unsigned char **pbuf, size_t size, int alloc);
|
|
|
|
int dh_KDF_X9_42_asn1(unsigned char *out, size_t outlen,
|
|
const unsigned char *Z, size_t Zlen,
|
|
const char *cek_alg,
|
|
const unsigned char *ukm, size_t ukmlen, const EVP_MD *md,
|
|
OSSL_LIB_CTX *libctx, const char *propq);
|