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

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  c1d0d2e690d2a33216de6c5920c81d9852080d36 (commit)
      from  69bb97c6d65250324a65fbb6fcac3fefb59d242a (commit)


- Log -----------------------------------------------------------------
commit c1d0d2e690d2a33216de6c5920c81d9852080d36
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 22 21:06:27 2017 +0100

    Fix typo, should be && rather than &
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2689)
    (cherry picked from commit 50799f3558981eac0482d3ea77b21c58b56d4871)

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

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

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index b6b13d3..271178f 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;