1 files changed, 167 insertions, 89 deletions

diff --git a/src/lib/libcrypto/gost/gostr341001.c b/src/lib/libcrypto/gost/gostr341001.c
index 3c314765f7..171cf1b80a 100644
--- a/src/lib/libcrypto/gost/gostr341001.c
+++ b/src/lib/libcrypto/gost/gostr341001.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001.c,v 1.1 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: gostr341001.c,v 1.2 2014/11/13 20:29:55 miod Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -59,10 +59,12 @@
 #include "gost_locl.h"
 
 /* Convert little-endian byte array into bignum */
-BIGNUM *GOST_le2bn(const unsigned char * buf, size_t len, BIGNUM * bn)
+BIGNUM *
+GOST_le2bn(const unsigned char *buf, size_t len, BIGNUM *bn)
 {
         unsigned char temp[64];
         int i;
+
         if (len > 64)
                 return NULL;
 
@@ -73,7 +75,8 @@ BIGNUM *GOST_le2bn(const unsigned char * buf, size_t len, BIGNUM * bn)
         return BN_bin2bn(temp, len, bn);
 }
 
-int GOST_bn2le(BIGNUM * bn, unsigned char * buf, int len)
+int
+GOST_bn2le(BIGNUM *bn, unsigned char *buf, int len)
 {
         unsigned char temp[64];
         int i, bytes;
@@ -93,8 +96,8 @@ int GOST_bn2le(BIGNUM * bn, unsigned char * buf, int len)
         return 1;
 }
 
-
-int gost2001_compute_public(GOST_KEY * ec)
+int
+gost2001_compute_public(GOST_KEY *ec)
 {
         const EC_GROUP *group = GOST_KEY_get0_group(ec);
         EC_POINT *pub_key = NULL;
@@ -102,36 +105,44 @@ int gost2001_compute_public(GOST_KEY * ec)
         BN_CTX *ctx = NULL;
         int ok = 0;
 
-        if (!group) {
+        if (group == NULL) {
                 GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC,
-                        GOST_R_KEY_IS_NOT_INITIALIZED);
+                    GOST_R_KEY_IS_NOT_INITIALIZED);
                 return 0;
         }
         ctx = BN_CTX_new();
+        if (ctx == NULL) {
+                GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC,
+                    ERR_R_MALLOC_FAILURE);
+                return 0;
+        }
         BN_CTX_start(ctx);
-        if (!(priv_key = GOST_KEY_get0_private_key(ec))) {
-                GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_EC_LIB);
+        if ((priv_key = GOST_KEY_get0_private_key(ec)) == NULL)
                 goto err;
-        }
 
         pub_key = EC_POINT_new(group);
-        if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx)) {
-                GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_EC_LIB);
+        if (pub_key == NULL)
                 goto err;
-        }
-        if (!GOST_KEY_set_public_key(ec, pub_key)) {
-                GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_EC_LIB);
+        if (EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, ctx) == 0)
                 goto err;
-        }
-        ok = 256;
+        if (GOST_KEY_set_public_key(ec, pub_key) == 0)
+                goto err;
+        ok = 1;
+
+        if (ok == 0) {
 err:
-        BN_CTX_end(ctx);
+                GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC, ERR_R_EC_LIB);
+        }
         EC_POINT_free(pub_key);
-        BN_CTX_free(ctx);
+        if (ctx != NULL) {
+                BN_CTX_end(ctx);
+                BN_CTX_free(ctx);
+        }
         return ok;
 }
 
-ECDSA_SIG *gost2001_do_sign(BIGNUM * md, GOST_KEY * eckey)
+ECDSA_SIG *
+gost2001_do_sign(BIGNUM *md, GOST_KEY *eckey)
 {
         ECDSA_SIG *newsig = NULL;
         BIGNUM *order = NULL;
@@ -141,9 +152,15 @@ ECDSA_SIG *gost2001_do_sign(BIGNUM * md, GOST_KEY * eckey)
             NULL, *e = NULL;
         EC_POINT *C = NULL;
         BN_CTX *ctx = BN_CTX_new();
+        int ok = 0;
+
+        if (ctx == NULL) {
+                GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_MALLOC_FAILURE);
+                return NULL;
+        }
         BN_CTX_start(ctx);
         newsig = ECDSA_SIG_new();
-        if (!newsig) {
+        if (newsig == NULL) {
                 GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
@@ -151,70 +168,88 @@ ECDSA_SIG *gost2001_do_sign(BIGNUM * md, GOST_KEY * eckey)
         r = newsig->r;
         group = GOST_KEY_get0_group(eckey);
         order = BN_CTX_get(ctx);
-        EC_GROUP_get_order(group, order, ctx);
+        if (order == NULL)
+                goto err;
+        if (EC_GROUP_get_order(group, order, ctx) == 0)
+                goto err;
         priv_key = GOST_KEY_get0_private_key(eckey);
         e = BN_CTX_get(ctx);
-        BN_mod(e, md, order, ctx);
-        if (BN_is_zero(e)) {
+        if (e == NULL)
+                goto err;
+        if (BN_mod(e, md, order, ctx) == 0)
+                goto err;
+        if (BN_is_zero(e))
                 BN_one(e);
-        }
         k = BN_CTX_get(ctx);
         X = BN_CTX_get(ctx);
         C = EC_POINT_new(group);
+        if (C == NULL)
+                goto err;
         do {
                 do {
                         if (!BN_rand_range(k, order)) {
                                 GOSTerr(GOST_F_GOST2001_DO_SIGN,
                                         GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
-                                ECDSA_SIG_free(newsig);
-                                newsig = NULL;
                                 goto err;
                         }
-                        /* We do not want timing information to leak the length of k,
-                         * so we compute G*k using an equivalent scalar of fixed
-                         * bit-length. */
-                        if (!BN_add(k, k, order))
+                        /*
+                         * We do not want timing information to leak the length
+                         * of k, so we compute G*k using an equivalent scalar
+                         * of fixed bit-length.
+                         */
+                        if (BN_add(k, k, order) == 0)
                                 goto err;
                         if (BN_num_bits(k) <= BN_num_bits(order))
-                                if (!BN_add(k, k, order))
+                                if (BN_add(k, k, order) == 0)
                                         goto err;
 
-                        if (!EC_POINT_mul(group, C, k, NULL, NULL, ctx)) {
+                        if (EC_POINT_mul(group, C, k, NULL, NULL, ctx) == 0) {
                                 GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_EC_LIB);
-                                ECDSA_SIG_free(newsig);
-                                newsig = NULL;
                                 goto err;
                         }
-                        if (!EC_POINT_get_affine_coordinates_GFp
-                            (group, C, X, NULL, ctx)) {
+                        if (EC_POINT_get_affine_coordinates_GFp(group, C, X,
+                            NULL, ctx) == 0) {
                                 GOSTerr(GOST_F_GOST2001_DO_SIGN, ERR_R_EC_LIB);
-                                ECDSA_SIG_free(newsig);
-                                newsig = NULL;
                                 goto err;
                         }
-                        BN_nnmod(r, X, order, ctx);
-                }
-                while (BN_is_zero(r));
-                /* s =  (r*priv_key+k*e) mod order */
-                if (!tmp)
+                        if (BN_nnmod(r, X, order, ctx) == 0)
+                                goto err;
+                } while (BN_is_zero(r));
+                /* s = (r*priv_key+k*e) mod order */
+                if (tmp == NULL) {
                         tmp = BN_CTX_get(ctx);
-                BN_mod_mul(tmp, priv_key, r, order, ctx);
-                if (!tmp2)
+                        if (tmp == NULL)
+                                goto err;
+                }
+                if (BN_mod_mul(tmp, priv_key, r, order, ctx) == 0)
+                        goto err;
+                if (tmp2 == NULL) {
                         tmp2 = BN_CTX_get(ctx);
-                BN_mod_mul(tmp2, k, e, order, ctx);
-                BN_mod_add(s, tmp, tmp2, order, ctx);
-        }
-        while (BN_is_zero(s));
+                        if (tmp2 == NULL)
+                                goto err;
+                }
+                if (BN_mod_mul(tmp2, k, e, order, ctx) == 0)
+                        goto err;
+                if (BN_mod_add(s, tmp, tmp2, order, ctx) == 0)
+                        goto err;
+        } while (BN_is_zero(s));
+        ok = 1;
 
 err:
-        BN_CTX_end(ctx);
-        BN_CTX_free(ctx);
         EC_POINT_free(C);
-        BN_free(md);
+        if (ctx != NULL) {
+                BN_CTX_end(ctx);
+                BN_CTX_free(ctx);
+        }
+        if (ok == 0) {
+                ECDSA_SIG_free(newsig);
+                newsig = NULL;
+        }
         return newsig;
 }
 
-int gost2001_do_verify(BIGNUM * md, ECDSA_SIG * sig, GOST_KEY * ec)
+int
+gost2001_do_verify(BIGNUM *md, ECDSA_SIG *sig, GOST_KEY *ec)
 {
         BN_CTX *ctx = BN_CTX_new();
         const EC_GROUP *group = GOST_KEY_get0_group(ec);
@@ -225,6 +260,8 @@ int gost2001_do_verify(BIGNUM * md, ECDSA_SIG * sig, GOST_KEY * ec)
         const EC_POINT *pub_key = NULL;
         int ok = 0;
 
+        if (ctx == NULL)
+                goto err;
         BN_CTX_start(ctx);
         order = BN_CTX_get(ctx);
         e = BN_CTX_get(ctx);
@@ -234,88 +271,129 @@ int gost2001_do_verify(BIGNUM * md, ECDSA_SIG * sig, GOST_KEY * ec)
         X = BN_CTX_get(ctx);
         R = BN_CTX_get(ctx);
         v = BN_CTX_get(ctx);
+        if (v == NULL)
+                goto err;
 
-        EC_GROUP_get_order(group, order, ctx);
+        if (EC_GROUP_get_order(group, order, ctx) == 0)
+                goto err;
         pub_key = GOST_KEY_get0_public_key(ec);
         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_GOST2001_DO_VERIFY, GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q);
+            BN_cmp(sig->s, order) >= 1 || BN_cmp(sig->r, order) >= 1) {
+                GOSTerr(GOST_F_GOST2001_DO_VERIFY,
+                    GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q);
                 goto err;
-
         }
 
-        BN_mod(e, md, order, ctx);
+        if (BN_mod(e, md, order, ctx) == 0)
+                goto err;
         if (BN_is_zero(e))
                 BN_one(e);
         v = BN_mod_inverse(v, e, order, ctx);
-        BN_mod_mul(z1, sig->s, v, order, ctx);
-        BN_sub(tmp, order, sig->r);
-        BN_mod_mul(z2, tmp, v, order, ctx);
+        if (v == NULL)
+                goto err;
+        if (BN_mod_mul(z1, sig->s, v, order, ctx) == 0)
+                goto err;
+        if (BN_sub(tmp, order, sig->r) == 0)
+                goto err;
+        if (BN_mod_mul(z2, tmp, v, order, ctx) == 0)
+                goto err;
         C = EC_POINT_new(group);
-        if (!EC_POINT_mul(group, C, z1, pub_key, z2, ctx)) {
+        if (C == NULL)
+                goto err;
+        if (EC_POINT_mul(group, C, z1, pub_key, z2, ctx) == 0) {
                 GOSTerr(GOST_F_GOST2001_DO_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_GFp(group, C, X, NULL, ctx) == 0) {
                 GOSTerr(GOST_F_GOST2001_DO_VERIFY, ERR_R_EC_LIB);
                 goto err;
         }
-        BN_mod(R, X, order, ctx);
+        if (BN_mod(R, X, order, ctx) == 0)
+                goto err;
         if (BN_cmp(R, sig->r) != 0) {
                 GOSTerr(GOST_F_GOST2001_DO_VERIFY, GOST_R_SIGNATURE_MISMATCH);
         } else {
                 ok = 1;
         }
- err:
+err:
         EC_POINT_free(C);
-        BN_CTX_end(ctx);
-        BN_CTX_free(ctx);
+        if (ctx != NULL) {
+                BN_CTX_end(ctx);
+                BN_CTX_free(ctx);
+        }
         return ok;
 }
 
-
 /* Implementation of CryptoPro VKO 34.10-2001 algorithm */
-void VKO_compute_key(BIGNUM * X, BIGNUM * Y,
-                     const GOST_KEY * pkey, GOST_KEY * priv_key,
-                     const BIGNUM * ukm)
+int
+VKO_compute_key(BIGNUM *X, BIGNUM *Y, const GOST_KEY *pkey, GOST_KEY *priv_key,
+    const BIGNUM *ukm)
 {
         BIGNUM *p = NULL, *order = NULL;
         const BIGNUM *key = GOST_KEY_get0_private_key(priv_key);
+        const EC_GROUP *group = GOST_KEY_get0_group(priv_key);
         const EC_POINT *pub_key = GOST_KEY_get0_public_key(pkey);
-        EC_POINT *pnt = EC_POINT_new(GOST_KEY_get0_group(priv_key));
-        BN_CTX *ctx = BN_CTX_new();
+        EC_POINT *pnt;
+        BN_CTX *ctx = NULL;
+        int ok = 0;
 
+        pnt = EC_POINT_new(group);
+        if (pnt == NULL)
+                goto err;
+        ctx = BN_CTX_new();
+        if (ctx == NULL)
+                goto err;
         BN_CTX_start(ctx);
         p = BN_CTX_get(ctx);
         order = BN_CTX_get(ctx);
-        EC_GROUP_get_order(GOST_KEY_get0_group(priv_key), order, ctx);
-        BN_mod_mul(p, key, ukm, order, ctx);
-        EC_POINT_mul(GOST_KEY_get0_group(priv_key), pnt, NULL, pub_key, p, ctx);
-        EC_POINT_get_affine_coordinates_GFp(GOST_KEY_get0_group(priv_key),
-                                            pnt, X, Y, ctx);
-        BN_CTX_end(ctx);
-        BN_CTX_free(ctx);
+        if (order == NULL)
+                goto err;
+        if (EC_GROUP_get_order(group, order, ctx) == 0)
+                goto err;
+        if (BN_mod_mul(p, key, ukm, order, ctx) == 0)
+                goto err;
+        if (EC_POINT_mul(group, pnt, NULL, pub_key, p, ctx) == 0)
+                goto err;
+        if (EC_POINT_get_affine_coordinates_GFp(group, pnt, X, Y, ctx) == 0)
+                goto err;
+        ok = 1;
+
+err:
+        if (ctx != NULL) {
+                BN_CTX_end(ctx);
+                BN_CTX_free(ctx);
+        }
         EC_POINT_free(pnt);
+        return ok;
 }
 
-int gost2001_keygen(GOST_KEY * ec)
+int
+gost2001_keygen(GOST_KEY *ec)
 {
         BIGNUM *order = BN_new(), *d = BN_new();
         const EC_GROUP *group = GOST_KEY_get0_group(ec);
-        EC_GROUP_get_order(group, order, NULL);
+        int rc = 0;
+
+        if (order == NULL || d == NULL)
+                goto err;
+        if (EC_GROUP_get_order(group, order, NULL) == 0)
+                goto err;
 
         do {
-                if (!BN_rand_range(d, order)) {
+                if (BN_rand_range(d, order) == 0) {
                         GOSTerr(GOST_F_GOST2001_KEYGEN,
                                 GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
-                        BN_free(d);
-                        BN_free(order);
-                        return 0;
+                        goto err;
                 }
         } while (BN_is_zero(d));
-        GOST_KEY_set_private_key(ec, d);
+
+        if (GOST_KEY_set_private_key(ec, d) == 0)
+                goto err;
+        rc = gost2001_compute_public(ec);
+
+err:
         BN_free(d);
         BN_free(order);
-        return gost2001_compute_public(ec);
+        return rc;
 }
 #endif