Hakase/openssl-custom
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Latest update.

Browse Source
This commit is contained in:
Hakase
2020-01-17 19:45:12 +09:00
parent 016df9f433
commit 0f7abb4eb6
1100 changed files with 47785 additions and 16292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
providers/implementations/keymgmt/dh_kmgmt.c
+78 -19
View File
@@ -12,12 +12,16 @@
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/params.h>
#include "internal/param_build.h"
#include "prov/implementations.h"
#include "prov/providercommon.h"
static OSSL_OP_keymgmt_importdomparams_fn dh_importdomparams;
static OSSL_OP_keymgmt_exportdomparams_fn dh_exportdomparams;
static OSSL_OP_keymgmt_get_key_params_fn dh_get_domparam_params;
static OSSL_OP_keymgmt_importkey_fn dh_importkey;
static OSSL_OP_keymgmt_exportkey_fn dh_exportkey;
static OSSL_OP_keymgmt_get_key_params_fn dh_get_key_params;
static int params_to_domparams(DH *dh, const OSSL_PARAM params[])
{
@@ -45,20 +49,19 @@ static int params_to_domparams(DH *dh, const OSSL_PARAM params[])
return 0;
}
static int domparams_to_params(DH *dh, OSSL_PARAM params[])
static int domparams_to_params(DH *dh, OSSL_PARAM_BLD *tmpl)
{
OSSL_PARAM *p;
const BIGNUM *dh_p = NULL, *dh_g = NULL;
if (dh == NULL)
return 0;
DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_FFC_P)) != NULL
&& !OSSL_PARAM_set_BN(p, dh_p))
if (dh_p != NULL
&& !ossl_param_bld_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, dh_p))
return 0;
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_FFC_G)) != NULL
&& !OSSL_PARAM_set_BN(p, dh_g))
if (dh_g != NULL
&& !ossl_param_bld_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G, dh_g))
return 0;
return 1;
@@ -105,24 +108,21 @@ static int params_to_key(DH *dh, const OSSL_PARAM params[])
return 0;
}
static int key_to_params(DH *dh, OSSL_PARAM params[])
static int key_to_params(DH *dh, OSSL_PARAM_BLD *tmpl)
{
OSSL_PARAM *p;
const BIGNUM *priv_key = NULL, *pub_key = NULL;
if (dh == NULL)
return 0;
if (!domparams_to_params(dh, params))
if (!domparams_to_params(dh, tmpl))
return 0;
DH_get0_key(dh, &pub_key, &priv_key);
if ((p = OSSL_PARAM_locate(params,
OSSL_PKEY_PARAM_DH_PRIV_KEY)) != NULL
&& !OSSL_PARAM_set_BN(p, priv_key))
if (priv_key != NULL
&& !ossl_param_bld_push_BN(tmpl, OSSL_PKEY_PARAM_DH_PRIV_KEY, priv_key))
return 0;
if ((p = OSSL_PARAM_locate(params,
OSSL_PKEY_PARAM_DH_PUB_KEY)) != NULL
&& !OSSL_PARAM_set_BN(p, pub_key))
if (pub_key != NULL
&& !ossl_param_bld_push_BN(tmpl, OSSL_PKEY_PARAM_DH_PUB_KEY, pub_key))
return 0;
return 1;
@@ -140,11 +140,22 @@ static void *dh_importdomparams(void *provctx, const OSSL_PARAM params[])
return dh;
}
static int dh_exportdomparams(void *domparams, OSSL_PARAM params[])
static int dh_exportdomparams(void *domparams, OSSL_CALLBACK *param_cb,
void *cbarg)
{
DH *dh = domparams;
OSSL_PARAM_BLD tmpl;
OSSL_PARAM *params = NULL;
int ret;
return dh != NULL && !domparams_to_params(dh, params);
ossl_param_bld_init(&tmpl);
if (dh == NULL
|| !domparams_to_params(dh, &tmpl)
|| (params = ossl_param_bld_to_param(&tmpl)) == NULL)
return 0;
ret = param_cb(params, cbarg);
ossl_param_bld_free(params);
return ret;
}
static void *dh_importkey(void *provctx, const OSSL_PARAM params[])
@@ -159,11 +170,56 @@ static void *dh_importkey(void *provctx, const OSSL_PARAM params[])
return dh;
}
static int dh_exportkey(void *key, OSSL_PARAM params[])
static int dh_exportkey(void *key, OSSL_CALLBACK *param_cb, void *cbarg)
{
DH *dh = key;
OSSL_PARAM_BLD tmpl;
OSSL_PARAM *params = NULL;
int ret;
return dh != NULL && !key_to_params(dh, params);
ossl_param_bld_init(&tmpl);
if (dh == NULL
|| !key_to_params(dh, &tmpl)
|| (params = ossl_param_bld_to_param(&tmpl)) == NULL)
return 0;
ret = param_cb(params, cbarg);
ossl_param_bld_free(params);
return ret;
}
/*
* Same function for domain parameters and for keys.
* "dpk" = "domain parameters & keys"
*/
static ossl_inline int dh_get_dpk_params(void *key, OSSL_PARAM params[])
{
DH *dh = key;
OSSL_PARAM *p;
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_BITS)) != NULL
&& !OSSL_PARAM_set_int(p, DH_bits(dh)))
return 0;
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_SECURITY_BITS)) != NULL
&& !OSSL_PARAM_set_int(p, DH_security_bits(dh)))
return 0;
if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_MAX_SIZE)) != NULL
&& !OSSL_PARAM_set_int(p, DH_size(dh)))
return 0;
return 1;
}
/*
* We have wrapper functions to make sure we get signatures right, see
* the forward declarations at the beginning of this file.
*/
static int dh_get_domparam_params(void *domparams, OSSL_PARAM params[])
{
return dh_get_dpk_params(domparams, params);
}
static int dh_get_key_params(void *key, OSSL_PARAM params[])
{
return dh_get_dpk_params(key, params);
}
const OSSL_DISPATCH dh_keymgmt_functions[] = {
@@ -173,9 +229,12 @@ const OSSL_DISPATCH dh_keymgmt_functions[] = {
*/
{ OSSL_FUNC_KEYMGMT_IMPORTDOMPARAMS, (void (*)(void))dh_importdomparams },
{ OSSL_FUNC_KEYMGMT_EXPORTDOMPARAMS, (void (*)(void))dh_exportdomparams },
{ OSSL_FUNC_KEYMGMT_GET_DOMPARAM_PARAMS,
(void (*) (void))dh_get_domparam_params },
{ OSSL_FUNC_KEYMGMT_FREEDOMPARAMS, (void (*)(void))DH_free },
{ OSSL_FUNC_KEYMGMT_IMPORTKEY, (void (*)(void))dh_importkey },
{ OSSL_FUNC_KEYMGMT_EXPORTKEY, (void (*)(void))dh_exportkey },
{ OSSL_FUNC_KEYMGMT_FREEKEY, (void (*)(void))DH_free },
{ OSSL_FUNC_KEYMGMT_GET_KEY_PARAMS, (void (*) (void))dh_get_key_params },
{ 0, NULL }
};