[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  50799f3558981eac0482d3ea77b21c58b56d4871 (commit)
      from  7c6335a6c74bd7742ec23fa45f84acf32985527f (commit)


- Log -----------------------------------------------------------------
commit 50799f3558981eac0482d3ea77b21c58b56d4871
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)

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

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;