From: Richard Levitte <levitte@openssl.org>
Date: Wed, 22 Feb 2017 20:06:27 +0000 (+0100)
Subject: Fix typo, should be && rather than &
X-Git-Tag: OpenSSL_1_1_0f~215
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c1d0d2e690d2a33216de6c5920c81d9852080d36;p=oweals%2Fopenssl.git

Fix typo, should be && rather than &

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2689)
(cherry picked from commit 50799f3558981eac0482d3ea77b21c58b56d4871)
---

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index b6b13d3c10..271178f82e 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -24,7 +24,7 @@ int EC_GROUP_get_basis_type(const EC_GROUP *group)
 
     /* Find the last non-zero element of group->poly[] */
     for (i = 0;
-         i < (int)OSSL_NELEM(group->poly) & group->poly[i] != 0;
+         i < (int)OSSL_NELEM(group->poly) && group->poly[i] != 0;
          i++)
         continue;