X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_ec_sign.c;h=2deb09324b50d15a50caaba367362d5f83a496b4;hb=445a097cfc4e18ad1634a4dce8bb9994dbf3ba15;hp=38c50ac8cd668f0a7ddaebb3c3fccd36e696bb64;hpb=cba16944bff9d8c5dcf37be641822cd3de6d2ec1;p=openssl-gost%2Fengine.git diff --git a/gost_ec_sign.c b/gost_ec_sign.c index 38c50ac..2deb093 100644 --- a/gost_ec_sign.c +++ b/gost_ec_sign.c @@ -7,7 +7,6 @@ * Requires OpenSSL 1.0.0+ for compilation * **********************************************************************/ #include "gost_lcl.h" -#include "gost_params.h" #include #include #include @@ -24,6 +23,21 @@ void dump_dsa_sig(const char *message, DSA_SIG *sig); # 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; @@ -60,7 +74,7 @@ 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; + BIGNUM *p = NULL, *q = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL, *cofactor = NULL; BN_CTX *ctx; int ok = 0; @@ -81,14 +95,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; } @@ -113,7 +129,7 @@ int fill_GOST_EC_params(EC_KEY *eckey, int nid) 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; } @@ -123,7 +139,7 @@ int fill_GOST_EC_params(EC_KEY *eckey, int nid) goto end; } ok = 1; -end: + end: if (P) EC_POINT_free(P); if (grp) @@ -146,6 +162,9 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) 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; @@ -161,7 +180,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) md = hashsum2bn(dgst, dlen); newsig = DSA_SIG_new(); if (!newsig || !md) { - GOSTerr(GOST_F_GOST_EC_SIGN, GOST_R_NO_MEMORY); + GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE); goto err; } group = EC_KEY_get0_group(eckey); @@ -204,8 +223,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) do { do { if (!BN_rand_range(k, order)) { - GOSTerr(GOST_F_GOST_EC_SIGN, - GOST_R_RANDOM_NUMBER_GENERATOR_FAILED); + GOSTerr(GOST_F_GOST_EC_SIGN, GOST_R_RNG_ERROR); goto err; } /* @@ -260,12 +278,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; } + DSA_SIG_set0(newsig, new_r, new_s); ret = newsig; err: @@ -293,6 +312,7 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len, BIGNUM *order; 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; @@ -301,7 +321,7 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len, OPENSSL_assert(dgst != NULL && sig != NULL && group != NULL); if (!(ctx = BN_CTX_new())) { - GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_NO_MEMORY); + GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_MALLOC_FAILURE); return 0; } @@ -325,8 +345,10 @@ 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)) { + DSA_SIG_get0(sig, &sig_r, &sig_s); + + if (BN_is_zero(sig_s) || BN_is_zero(sig_r) || + (BN_cmp(sig_s, order) >= 1) || (BN_cmp(sig_r, order) >= 1)) { GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q); goto err; @@ -349,9 +371,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; @@ -388,7 +409,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; @@ -488,8 +509,7 @@ int gost_ec_keygen(EC_KEY *ec) do { if (!BN_rand_range(d, order)) { - GOSTerr(GOST_F_GOST_EC_KEYGEN, - GOST_R_RANDOM_NUMBER_GENERATOR_FAILED); + GOSTerr(GOST_F_GOST_EC_KEYGEN, GOST_R_RNG_ERROR); goto end; } } @@ -501,11 +521,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; }