[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  93c616d6110d29c513c46d82b2283eb1a9e74dc0 (commit)
      from  fd7ca7465b67336b8950a505b6d2adee867a78f7 (commit)


- Log -----------------------------------------------------------------
commit 93c616d6110d29c513c46d82b2283eb1a9e74dc0
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Aug 22 13:35:27 2016 +0200

    GOST: rearrange code so it's more like C rather than C++
    
    Some builds fail otherwise.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 engines/ccgost/gost2001.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/ccgost/gost2001.c b/engines/ccgost/gost2001.c
index 57f6ee2..881d0d3 100644
--- a/engines/ccgost/gost2001.c
+++ b/engines/ccgost/gost2001.c
@@ -434,14 +434,16 @@ int gost2001_compute_public(EC_KEY *ec)
 int gost2001_keygen(EC_KEY *ec)
 {
     BIGNUM *order = BN_new(), *d = BN_new();
+    const EC_GROUP *group = NULL;
+
     if (order == NULL || d == NULL) {
         GOSTerr(GOST_F_GOST2001_KEYGEN, ERR_R_MALLOC_FAILURE);
         BN_free(d);
         BN_free(order);
         return 0;
     }
-    const EC_GROUP *group = EC_KEY_get0_group(ec);
 
+    group = EC_KEY_get0_group(ec);
     if(!group || !EC_GROUP_get_order(group, order, NULL)) {
         GOSTerr(GOST_F_GOST2001_KEYGEN, ERR_R_INTERNAL_ERROR);
         BN_free(d);