gost_crypt: process full available block in CFB and CNT mode

[openssl-gost/engine.git] / gost_ec_sign.c

diff --git a/gost_ec_sign.c b/gost_ec_sign.c
index 904b80c6b22512b185280757e1cb5dcfd9d31b80..2deb09324b50d15a50caaba367362d5f83a496b4 100644 (file)
--- a/gost_ec_sign.c
+++ b/gost_ec_sign.c
@@ -74,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;
 
@@ -95,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;
     }
@@ -127,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;
     }
@@ -161,7 +163,7 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
     BIGNUM *r = NULL, *s = NULL, *X = NULL, *tmp = NULL, *tmp2 = NULL,
         *k = NULL, *e = NULL;
 
-    const BIGNUM *new_r = NULL, *new_s = NULL;
+    BIGNUM *new_r = NULL, *new_s = NULL;
 
     EC_POINT *C = NULL;
     BN_CTX *ctx;
@@ -276,13 +278,13 @@ DSA_SIG *gost_ec_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
     }
     while (BN_is_zero(s));
 
-    DSA_SIG_get0(newsig, &new_r, &new_s);
     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: