Latest update.
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <openssl/core_names.h>
|
||||
#include "internal/ffc.h"
|
||||
#include "internal/sizes.h"
|
||||
|
||||
/*
|
||||
* The intention with the "backend" source file is to offer backend support
|
||||
@@ -16,27 +17,76 @@
|
||||
* implementations alike.
|
||||
*/
|
||||
|
||||
int ffc_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
|
||||
int ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
|
||||
{
|
||||
const OSSL_PARAM *prm;
|
||||
const OSSL_PARAM *param_p, *param_q, *param_g;
|
||||
BIGNUM *p = NULL, *q = NULL, *g = NULL;
|
||||
BIGNUM *p = NULL, *q = NULL, *g = NULL, *j = NULL;
|
||||
int i;
|
||||
|
||||
if (ffc == NULL)
|
||||
return 0;
|
||||
|
||||
prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_GROUP);
|
||||
if (prm != NULL) {
|
||||
if (prm->data_type != OSSL_PARAM_UTF8_STRING)
|
||||
goto err;
|
||||
#ifndef OPENSSL_NO_DH
|
||||
/*
|
||||
* In a no-dh build we just go straight to err because we have no
|
||||
* support for this.
|
||||
*/
|
||||
if (!ffc_set_group_pqg(ffc, prm->data))
|
||||
#endif
|
||||
goto err;
|
||||
}
|
||||
|
||||
param_p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_P);
|
||||
param_q = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_Q);
|
||||
param_g = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_G);
|
||||
param_q = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_Q);
|
||||
|
||||
if ((param_p != NULL && !OSSL_PARAM_get_BN(param_p, &p))
|
||||
|| (param_q != NULL && !OSSL_PARAM_get_BN(param_q, &q))
|
||||
|| (param_g != NULL && !OSSL_PARAM_get_BN(param_g, &g)))
|
||||
goto err;
|
||||
|
||||
prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_GINDEX);
|
||||
if (prm != NULL) {
|
||||
if (!OSSL_PARAM_get_int(prm, &i))
|
||||
goto err;
|
||||
ffc->gindex = i;
|
||||
}
|
||||
prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_PCOUNTER);
|
||||
if (prm != NULL) {
|
||||
if (!OSSL_PARAM_get_int(prm, &i))
|
||||
goto err;
|
||||
ffc->pcounter = i;
|
||||
}
|
||||
prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_COFACTOR);
|
||||
if (prm != NULL) {
|
||||
if (!OSSL_PARAM_get_BN(prm, &j))
|
||||
goto err;
|
||||
j = NULL;
|
||||
}
|
||||
prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_H);
|
||||
if (prm != NULL) {
|
||||
if (!OSSL_PARAM_get_int(prm, &i))
|
||||
goto err;
|
||||
ffc->h = i;
|
||||
}
|
||||
prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_SEED);
|
||||
if (prm != NULL) {
|
||||
if (prm->data_type != OSSL_PARAM_OCTET_STRING)
|
||||
goto err;
|
||||
if (!ffc_params_set_seed(ffc, prm->data, prm->data_size))
|
||||
goto err;
|
||||
}
|
||||
ffc_params_set0_pqg(ffc, p, q, g);
|
||||
ffc_params_set0_j(ffc, j);
|
||||
return 1;
|
||||
|
||||
err:
|
||||
BN_free(j);
|
||||
BN_free(p);
|
||||
BN_free(q);
|
||||
BN_free(g);
|
||||
|
||||
Reference in New Issue
Block a user