[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Paul I. Dale]

The branch OpenSSL_1_1_0-stable has been updated
       via  003f1bfd185267cc67ac9dc521a27d7a2af0d0ee (commit)
      from  56fb454d281a023b3f950d969693553d3f3ceea1 (commit)


- Log -----------------------------------------------------------------
commit 003f1bfd185267cc67ac9dc521a27d7a2af0d0ee
Author: Rod Vagg <rod at vagg.org>
Date:   Mon Oct 29 20:43:53 2018 +1100

    Remove brace from bad cherry-pick of DSA reallocation fix
    
    Commit 56fb454 backported the DSA reallocation fix to 1.1.0, however a
    code block that has multiple statements in 1.1.1+ only has a `goto` in
    1.1.0 so introduces a brace that causes a compile failure.
    
    CLA:trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7516)

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

Summary of changes:
 crypto/ec/ec_mult.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index ff882cc..8350082 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -178,7 +178,7 @@ static int ec_mul_consttime(const EC_GROUP *group, EC_POINT *r,
     cardinality_bits = BN_num_bits(cardinality);
     group_top = bn_get_top(cardinality);
     if ((bn_wexpand(k, group_top + 2) == NULL)
-        || (bn_wexpand(lambda, group_top + 2) == NULL)) {
+        || (bn_wexpand(lambda, group_top + 2) == NULL))
         goto err;
 
     if (!BN_copy(k, scalar))