From: Rod Vagg <rod@vagg.org>
Date: Mon, 29 Oct 2018 09:43:53 +0000 (+1100)
Subject: Remove brace from bad cherry-pick of DSA reallocation fix
X-Git-Tag: OpenSSL_1_1_0j~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=003f1bfd185267cc67ac9dc521a27d7a2af0d0ee;p=oweals%2Fopenssl.git

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@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7516)
---

diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index ff882cce20..8350082eb4 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))