# define dump_dsa_sig(a,b)
#endif
-/* Convert little-endian byte array into bignum */
-BIGNUM *hashsum2bn(const unsigned char *dgst, int len)
-{
- unsigned char buf[64];
- int i;
-
- if (len > sizeof(buf))
- return NULL;
-
- for (i = 0; i < len; i++) {
- buf[len - i - 1] = dgst[i];
- }
- return BN_bin2bn(buf, len, NULL);
-}
-
static R3410_ec_params *gost_nid2params(int nid)
{
R3410_ec_params *params;
/* Map tc26-2012 256-bit parameters to cp-2001 parameters */
switch (nid) {
- case NID_id_tc26_gost_3410_2012_256_paramSetB:
- nid = NID_id_GostR3410_2001_CryptoPro_A_ParamSet;
- break;
- case NID_id_tc26_gost_3410_2012_256_paramSetC:
- nid = NID_id_GostR3410_2001_CryptoPro_B_ParamSet;
- break;
- case NID_id_tc26_gost_3410_2012_256_paramSetD:
- nid = NID_id_GostR3410_2001_CryptoPro_C_ParamSet;
+ case NID_id_tc26_gost_3410_2012_256_paramSetB:
+ nid = NID_id_GostR3410_2001_CryptoPro_A_ParamSet;
+ break;
+ case NID_id_tc26_gost_3410_2012_256_paramSetC:
+ nid = NID_id_GostR3410_2001_CryptoPro_B_ParamSet;
+ break;
+ case NID_id_tc26_gost_3410_2012_256_paramSetD:
+ nid = NID_id_GostR3410_2001_CryptoPro_C_ParamSet;
}
/* Search nid in 2012 paramset */
GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_INTERNAL_ERROR);
goto end;
}
- EC_GROUP_set_curve_name(grp, params->nid);
+ EC_GROUP_set_curve_name(grp, nid);
if (!EC_KEY_set_group(eckey, grp)) {
GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_INTERNAL_ERROR);
goto end;
OPENSSL_assert(dgst != NULL && eckey != NULL);
- if (!(ctx = BN_CTX_new())) {
+ if (!(ctx = BN_CTX_secure_new())) {
GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE);
return NULL;
}
BN_CTX_start(ctx);
OPENSSL_assert(dlen == 32 || dlen == 64);
- md = hashsum2bn(dgst, dlen);
+ md = BN_lebin2bn(dgst, dlen, NULL);
newsig = ECDSA_SIG_new();
if (!newsig || !md) {
GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE);
GOSTerr(GOST_F_GOST_EC_SIGN, GOST_R_RNG_ERROR);
goto err;
}
- /*
- * To avoid timing information leaking the length of k,
- * compute C*k using an equivalent scalar of fixed bit-length */
- if (!BN_add(k, k, order)
- || (BN_num_bits(k) <= BN_num_bits(order)
- && !BN_add(k, k, order))) {
- goto err;
- }
- if (!EC_POINT_mul(group, C, k, NULL, NULL, ctx)) {
+ if (!gost_ec_point_mul(group, C, k, NULL, NULL, ctx)) {
GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_EC_LIB);
goto err;
}
}
OPENSSL_assert(dgst_len == 32 || dgst_len == 64);
- md = hashsum2bn(dgst, dgst_len);
+ md = BN_lebin2bn(dgst, dgst_len, NULL);
if (!md || !BN_mod(e, md, order, ctx)) {
GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_INTERNAL_ERROR);
goto err;
GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_MALLOC_FAILURE);
goto err;
}
- if (!EC_POINT_mul(group, C, z1, pub_key, z2, ctx)) {
+ if (!gost_ec_point_mul(group, C, z1, pub_key, z2, ctx)) {
GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_EC_LIB);
goto err;
}
return 0;
}
- ctx = BN_CTX_new();
+ ctx = BN_CTX_secure_new();
if (!ctx) {
GOSTerr(GOST_F_GOST_EC_COMPUTE_PUBLIC, ERR_R_MALLOC_FAILURE);
return 0;
goto err;
}
- if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx)) {
+ if (!gost_ec_point_mul(group, pub_key, priv_key, NULL, NULL, ctx)) {
GOSTerr(GOST_F_GOST_EC_COMPUTE_PUBLIC, ERR_R_EC_LIB);
goto err;
}
return ok;
}
+int gost_ec_point_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
+ const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx)
+{
+ if (group == NULL || r == NULL || ctx == NULL)
+ return 0;
+
+ if (m != NULL && n != NULL) {
+ /* verification */
+ if (q == NULL)
+ return 0;
+ switch(EC_GROUP_get_curve_name(group)) {
+ case NID_id_GostR3410_2001_CryptoPro_A_ParamSet:
+ case NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetB:
+ return point_mul_two_id_GostR3410_2001_CryptoPro_A_ParamSet(group, r, n, q, m, ctx);
+ case NID_id_GostR3410_2001_CryptoPro_B_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetC:
+ return point_mul_two_id_GostR3410_2001_CryptoPro_B_ParamSet(group, r, n, q, m, ctx);
+ case NID_id_GostR3410_2001_CryptoPro_C_ParamSet:
+ case NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetD:
+ return point_mul_two_id_GostR3410_2001_CryptoPro_C_ParamSet(group, r, n, q, m, ctx);
+ case NID_id_GostR3410_2001_TestParamSet:
+ return point_mul_two_id_GostR3410_2001_TestParamSet(group, r, n, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_256_paramSetA:
+ return point_mul_two_id_tc26_gost_3410_2012_256_paramSetA(group, r, n, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetA:
+ return point_mul_two_id_tc26_gost_3410_2012_512_paramSetA(group, r, n, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetB:
+ return point_mul_two_id_tc26_gost_3410_2012_512_paramSetB(group, r, n, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetC:
+ return point_mul_two_id_tc26_gost_3410_2012_512_paramSetC(group, r, n, q, m, ctx);
+ default:
+ return EC_POINT_mul(group, r, n, q, m, ctx);
+ }
+ } else if (n != NULL) {
+ /* mul g */
+ switch(EC_GROUP_get_curve_name(group)) {
+ case NID_id_GostR3410_2001_CryptoPro_A_ParamSet:
+ case NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetB:
+ return point_mul_g_id_GostR3410_2001_CryptoPro_A_ParamSet(group, r, n, ctx);
+ case NID_id_GostR3410_2001_CryptoPro_B_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetC:
+ return point_mul_g_id_GostR3410_2001_CryptoPro_B_ParamSet(group, r, n, ctx);
+ case NID_id_GostR3410_2001_CryptoPro_C_ParamSet:
+ case NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetD:
+ return point_mul_g_id_GostR3410_2001_CryptoPro_C_ParamSet(group, r, n, ctx);
+ case NID_id_GostR3410_2001_TestParamSet:
+ return point_mul_g_id_GostR3410_2001_TestParamSet(group, r, n, ctx);
+ case NID_id_tc26_gost_3410_2012_256_paramSetA:
+ return point_mul_g_id_tc26_gost_3410_2012_256_paramSetA(group, r, n, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetA:
+ return point_mul_g_id_tc26_gost_3410_2012_512_paramSetA(group, r, n, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetB:
+ return point_mul_g_id_tc26_gost_3410_2012_512_paramSetB(group, r, n, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetC:
+ return point_mul_g_id_tc26_gost_3410_2012_512_paramSetC(group, r, n, ctx);
+ default:
+ return EC_POINT_mul(group, r, n, q, m, ctx);
+ }
+ } else if (m != NULL) {
+ if (q == NULL)
+ return 0;
+ /* mul */
+ switch(EC_GROUP_get_curve_name(group)) {
+ case NID_id_GostR3410_2001_CryptoPro_A_ParamSet:
+ case NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetB:
+ return point_mul_id_GostR3410_2001_CryptoPro_A_ParamSet(group, r, q, m, ctx);
+ case NID_id_GostR3410_2001_CryptoPro_B_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetC:
+ return point_mul_id_GostR3410_2001_CryptoPro_B_ParamSet(group, r, q, m, ctx);
+ case NID_id_GostR3410_2001_CryptoPro_C_ParamSet:
+ case NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet:
+ case NID_id_tc26_gost_3410_2012_256_paramSetD:
+ return point_mul_id_GostR3410_2001_CryptoPro_C_ParamSet(group, r, q, m, ctx);
+ case NID_id_GostR3410_2001_TestParamSet:
+ return point_mul_id_GostR3410_2001_TestParamSet(group, r, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_256_paramSetA:
+ return point_mul_id_tc26_gost_3410_2012_256_paramSetA(group, r, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetA:
+ return point_mul_id_tc26_gost_3410_2012_512_paramSetA(group, r, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetB:
+ return point_mul_id_tc26_gost_3410_2012_512_paramSetB(group, r, q, m, ctx);
+ case NID_id_tc26_gost_3410_2012_512_paramSetC:
+ return point_mul_id_tc26_gost_3410_2012_512_paramSetC(group, r, q, m, ctx);
+ default:
+ return EC_POINT_mul(group, r, n, q, m, ctx);
+ }
+ }
+ return 0;
+}
+
/*
*
* Generates GOST R 34.10-2001
}
order = BN_new();
- d = BN_new();
+ d = BN_secure_new();
if (!order || !d) {
GOSTerr(GOST_F_GOST_EC_KEYGEN, ERR_R_MALLOC_FAILURE);
goto end;
return (ok) ? gost_ec_compute_public(ec) : 0;
}
+
+int gost_ec_oct2point(const EC_GROUP *group, EC_POINT *point,
+ const unsigned char *buf, size_t len)
+{
+ BN_CTX *ctx = NULL;
+ BIGNUM *x, *y, *p;
+ size_t field_len, enc_len;
+ int ret = 0;
+
+ if (len == 0) {
+ GOSTerr(GOST_F_GOST_EC_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
+ return 0;
+ }
+
+ field_len = (EC_GROUP_get_degree(group) + 7) / 8;
+ enc_len = 2 * field_len;
+
+ if (len != enc_len) {
+ GOSTerr(GOST_F_GOST_EC_OCT2POINT, EC_R_INVALID_ENCODING);
+ return 0;
+ }
+
+ ctx = BN_CTX_new();
+ if (ctx == NULL)
+ return 0;
+
+ BN_CTX_start(ctx);
+ x = BN_CTX_get(ctx);
+ y = BN_CTX_get(ctx);
+ p = BN_CTX_get(ctx);
+ if (y == NULL)
+ goto err;
+
+ if (!EC_GROUP_get_curve(group, p, NULL, NULL, NULL))
+ goto err;
+
+ if (!BN_lebin2bn(buf, field_len, x))
+ goto err;
+ if (BN_ucmp(x, p) >= 0) {
+ GOSTerr(GOST_F_GOST_EC_OCT2POINT, EC_R_INVALID_ENCODING);
+ goto err;
+ }
+
+ if (!BN_lebin2bn(buf + field_len, field_len, y))
+ goto err;
+ if (BN_ucmp(y, p) >= 0) {
+ GOSTerr(GOST_F_GOST_EC_OCT2POINT, EC_R_INVALID_ENCODING);
+ goto err;
+ }
+
+ /*
+ * EC_POINT_set_affine_coordinates is responsible for checking that
+ * the point is on the curve.
+ */
+ if (!EC_POINT_set_affine_coordinates(group, point, x, y, ctx))
+ goto err;
+
+ ret = 1;
+
+ err:
+ BN_CTX_end(ctx);
+ BN_CTX_free(ctx);
+ return ret;
+}
+
+
+size_t gost_ec_point2oct(const EC_GROUP *group, const EC_POINT *point,
+ unsigned char *buf, size_t len)
+{
+ size_t ret;
+ BN_CTX *ctx = NULL;
+ int used_ctx = 0;
+ BIGNUM *x, *y;
+ size_t field_len;
+
+ field_len = (EC_GROUP_get_degree(group) + 7) / 8;
+ ret = 2 * field_len;
+
+ if (buf != NULL) {
+ if (len < ret) {
+ GOSTerr(GOST_F_GOST_EC_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+ goto err;
+ }
+
+ ctx = BN_CTX_new();
+ if (ctx == NULL)
+ return 0;
+
+ BN_CTX_start(ctx);
+ used_ctx = 1;
+ x = BN_CTX_get(ctx);
+ y = BN_CTX_get(ctx);
+ if (y == NULL)
+ goto err;
+
+ if (!EC_POINT_get_affine_coordinates(group, point, x, y, ctx))
+ goto err;
+
+ if (BN_bn2lebinpad(x, buf, field_len) != field_len
+ || BN_bn2lebinpad(y, buf + field_len, field_len) != field_len)
+ goto err;
+ }
+
+ if (used_ctx)
+ BN_CTX_end(ctx);
+ BN_CTX_free(ctx);
+ return ret;
+
+ err:
+ if (used_ctx)
+ BN_CTX_end(ctx);
+ BN_CTX_free(ctx);
+ return 0;
+}
+
+size_t gost_ec_key2buf(const EC_KEY *key, unsigned char **pbuf)
+{
+ size_t len;
+ unsigned char *buf;
+ const EC_GROUP *grp = NULL;
+ const EC_POINT *pkey = NULL;
+
+ pkey = EC_KEY_get0_public_key(key);
+ grp = EC_KEY_get0_group(key);
+
+ if(pkey == NULL || grp == NULL)
+ return 0;
+
+ len = gost_ec_point2oct(grp, pkey, NULL, 0);
+ if (len == 0)
+ return 0;
+ if ((buf = OPENSSL_malloc(len)) == NULL) {
+ GOSTerr(GOST_F_GOST_EC_KEY2BUF, ERR_R_MALLOC_FAILURE);
+ return 0;
+ }
+ len = gost_ec_point2oct(grp, pkey, buf, len);
+ if (len == 0) {
+ OPENSSL_free(buf);
+ return 0;
+ }
+ *pbuf = buf;
+ return len;
+}
+
+int gost_ec_oct2key(EC_KEY *key, const unsigned char *buf, size_t len)
+{
+ const EC_GROUP *group = NULL;
+ const EC_POINT *pub_key = NULL;
+ EC_POINT *point = NULL;
+ int ok = 0;
+
+ if (key == NULL || (group = EC_KEY_get0_group(key)) == NULL)
+ return 0;
+
+ if ((pub_key = EC_KEY_get0_public_key(key)) == NULL) {
+ if((point = EC_POINT_new(group)) == NULL ||
+ !EC_KEY_set_public_key(key, point))
+ goto err;
+ pub_key = EC_KEY_get0_public_key(key);
+ }
+
+ if (gost_ec_oct2point(group, (EC_POINT *)pub_key, buf, len) == 0)
+ goto err;
+
+ ok = 1;
+
+ err:
+ if (point)
+ EC_POINT_free(point);
+ return ok;
+}
projects / openssl-gost / engine.git / blobdiff