X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=openssl-gost%2Fengine.git;a=blobdiff_plain;f=gost_ec_sign.c;h=a825dbabac64e0a6eb1dfa077954ba10ee14a1de;hp=9d542ceac4da117e9662cf5598480b7ef03e8fc5;hb=HEAD;hpb=671a6236ffa2e92bc635db1429ed0d7ae8d3a959 diff --git a/gost_ec_sign.c b/gost_ec_sign.c index 9d542ce..a825dba 100644 --- a/gost_ec_sign.c +++ b/gost_ec_sign.c @@ -16,32 +16,29 @@ extern void dump_signature(const char *message, const unsigned char *buffer, size_t len); -void dump_dsa_sig(const char *message, DSA_SIG *sig); +void dump_dsa_sig(const char *message, ECDSA_SIG *sig); #else # define dump_signature(a,b,c) # 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 getbnfrombuf(buf, len); -} - 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; + } + /* Search nid in 2012 paramset */ params = R3410_2012_512_paramset; while (params->nid != NID_undef) { @@ -61,6 +58,27 @@ static R3410_ec_params *gost_nid2params(int nid) return NULL; } +void free_cached_groups() +{ + R3410_ec_params *params; + + /* Search nid in 2012 paramset */ + params = R3410_2012_512_paramset; + while (params->nid != NID_undef) { + EC_GROUP_free(params->group); + params->group = NULL; + params++; + } + + /* Search nid in 2001 paramset */ + params = R3410_2001_paramset; + while (params->nid != NID_undef) { + EC_GROUP_free(params->group); + params->group = NULL; + params++; + } +} + /* * Fills EC_KEY structure hidden in the app_data field of DSA structure * with parameter information, extracted from parameter array in @@ -74,8 +92,9 @@ int fill_GOST_EC_params(EC_KEY *eckey, int nid) R3410_ec_params *params = gost_nid2params(nid); EC_GROUP *grp = NULL; EC_POINT *P = NULL; - BIGNUM *p = NULL, *q = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL; - BN_CTX *ctx; + BIGNUM *p = NULL, *q = NULL, *a = NULL, *b = NULL, *x = NULL, *y = + NULL, *cofactor = NULL; + BN_CTX *ctx = NULL; int ok = 0; if (!eckey || !params) { @@ -83,6 +102,15 @@ int fill_GOST_EC_params(EC_KEY *eckey, int nid) return 0; } + if (params->group) { + EC_GROUP_set_curve_name(params->group, nid); + if (!EC_KEY_set_group(eckey, params->group)) { + GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_INTERNAL_ERROR); + goto end; + } + return 1; + } + if (!(ctx = BN_CTX_new())) { GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_MALLOC_FAILURE); return 0; @@ -95,14 +123,16 @@ int fill_GOST_EC_params(EC_KEY *eckey, int nid) x = BN_CTX_get(ctx); y = BN_CTX_get(ctx); q = BN_CTX_get(ctx); - if (!p || !a || !b || !x || !y || !q) { + cofactor = BN_CTX_get(ctx); + if (!p || !a || !b || !x || !y || !q || !cofactor) { GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_MALLOC_FAILURE); goto end; } if (!BN_hex2bn(&p, params->p) || !BN_hex2bn(&a, params->a) - || !BN_hex2bn(&b, params->b)) { + || !BN_hex2bn(&b, params->b) + || !BN_hex2bn(&cofactor, params->cofactor)) { GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_INTERNAL_ERROR); goto end; } @@ -121,59 +151,60 @@ int fill_GOST_EC_params(EC_KEY *eckey, int nid) if (!BN_hex2bn(&x, params->x) || !BN_hex2bn(&y, params->y) - || !EC_POINT_set_affine_coordinates_GFp(grp, P, x, y, ctx) + || !EC_POINT_set_affine_coordinates(grp, P, x, y, ctx) || !BN_hex2bn(&q, params->q)) { GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_INTERNAL_ERROR); goto end; } - if (!EC_GROUP_set_generator(grp, P, q, NULL)) { + if (!EC_GROUP_set_generator(grp, P, q, cofactor)) { 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); + params->group = grp; if (!EC_KEY_set_group(eckey, grp)) { GOSTerr(GOST_F_FILL_GOST_EC_PARAMS, ERR_R_INTERNAL_ERROR); goto end; } ok = 1; -end: - if (P) - EC_POINT_free(P); - if (grp) - EC_GROUP_free(grp); + end: + EC_POINT_free(P); BN_CTX_end(ctx); BN_CTX_free(ctx); return ok; } /* - * Computes gost_ec signature as DSA_SIG structure + * Computes gost_ec signature as ECDSA_SIG structure * */ -DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) +ECDSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) { - DSA_SIG *newsig = NULL, *ret = NULL; + ECDSA_SIG *newsig = NULL, *ret = NULL; BIGNUM *md = NULL; BIGNUM *order = NULL; const EC_GROUP *group; const BIGNUM *priv_key; BIGNUM *r = NULL, *s = NULL, *X = NULL, *tmp = NULL, *tmp2 = NULL, *k = NULL, *e = NULL; + + BIGNUM *new_r = NULL, *new_s = NULL; + EC_POINT *C = NULL; BN_CTX *ctx; 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); - newsig = DSA_SIG_new(); + md = BN_lebin2bn(dgst, dlen, NULL); + newsig = ECDSA_SIG_new(); if (!newsig || !md) { GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE); goto err; @@ -221,15 +252,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) 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; } @@ -241,7 +264,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE); goto err; } - if (!EC_POINT_get_affine_coordinates_GFp(group, C, X, NULL, ctx)) { + if (!EC_POINT_get_affine_coordinates(group, C, X, NULL, ctx)) { GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_EC_LIB); goto err; } @@ -273,12 +296,13 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) } while (BN_is_zero(s)); - newsig->s = BN_dup(s); - newsig->r = BN_dup(r); - if (!newsig->s || !newsig->r) { + new_s = BN_dup(s); + new_r = BN_dup(r); + if (!new_s || !new_r) { GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE); goto err; } + ECDSA_SIG_set0(newsig, new_r, new_s); ret = newsig; err: @@ -289,7 +313,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) if (md) BN_free(md); if (!ret && newsig) { - DSA_SIG_free(newsig); + ECDSA_SIG_free(newsig); } return ret; } @@ -299,13 +323,13 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) * */ int gost_ec_verify(const unsigned char *dgst, int dgst_len, - DSA_SIG *sig, EC_KEY *ec) + ECDSA_SIG *sig, EC_KEY *ec) { BN_CTX *ctx; const EC_GROUP *group = (ec) ? EC_KEY_get0_group(ec) : NULL; BIGNUM *order; - BIGNUM *md = NULL, *e = NULL, *R = NULL, *v = NULL, - *z1 = NULL, *z2 = NULL; + BIGNUM *md = NULL, *e = NULL, *R = NULL, *v = NULL, *z1 = NULL, *z2 = NULL; + const BIGNUM *sig_s = NULL, *sig_r = NULL; BIGNUM *X = NULL, *tmp = NULL; EC_POINT *C = NULL; const EC_POINT *pub_key = NULL; @@ -338,15 +362,17 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len, goto err; } - if (BN_is_zero(sig->s) || BN_is_zero(sig->r) || - (BN_cmp(sig->s, order) >= 1) || (BN_cmp(sig->r, order) >= 1)) { + ECDSA_SIG_get0(sig, &sig_r, &sig_s); + + if (BN_is_zero(sig_s) || BN_is_zero(sig_r) || + BN_is_negative(sig_s) || BN_is_negative(sig_r) || + BN_ucmp(sig_s, order) >= 0 || BN_ucmp(sig_r, order) >= 0) { GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q); 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; @@ -362,9 +388,8 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len, goto err; } v = BN_mod_inverse(v, e, order, ctx); - if (!v - || !BN_mod_mul(z1, sig->s, v, order, ctx) - || !BN_sub(tmp, order, sig->r) + if (!v || !BN_mod_mul(z1, sig_s, v, order, ctx) + || !BN_sub(tmp, order, sig_r) || !BN_mod_mul(z2, tmp, v, order, ctx)) { GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_INTERNAL_ERROR); goto err; @@ -382,11 +407,11 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len, 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; } - if (!EC_POINT_get_affine_coordinates_GFp(group, C, X, NULL, ctx)) { + if (!EC_POINT_get_affine_coordinates(group, C, X, NULL, ctx)) { GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_EC_LIB); goto err; } @@ -401,7 +426,7 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len, BN_print_fp(stderr, R); fprintf(stderr, "\n"); #endif - if (BN_cmp(R, sig->r) != 0) { + if (BN_cmp(R, sig_r) != 0) { GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_SIGNATURE_MISMATCH); } else { ok = 1; @@ -434,7 +459,7 @@ int gost_ec_compute_public(EC_KEY *ec) 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; @@ -453,7 +478,7 @@ int gost_ec_compute_public(EC_KEY *ec) 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; } @@ -470,6 +495,101 @@ int gost_ec_compute_public(EC_KEY *ec) 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 @@ -488,7 +608,7 @@ int gost_ec_keygen(EC_KEY *ec) } 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; @@ -513,11 +633,11 @@ int gost_ec_keygen(EC_KEY *ec) } ok = 1; -end: + end: if (d) BN_free(d); if (order) BN_free(order); - + return (ok) ? gost_ec_compute_public(ec) : 0; }