[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  57f48f939ed5d3119e3c691ea0a8a3ac2f4a1a9e (commit)
      from  5c80e2af3a7d8aa5129a1668c286c1464983e1ac (commit)


- Log -----------------------------------------------------------------
commit 57f48f939ed5d3119e3c691ea0a8a3ac2f4a1a9e
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Feb 22 13:11:08 2017 -0500

    Iterate over EC_GROUP's poly array in a safe way
    
    Prevent that memory beyond the last element is accessed if every element
    of group->poly[] is non-zero
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 4f4d1ed..b6b13d3 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -15,15 +15,18 @@
 
 int EC_GROUP_get_basis_type(const EC_GROUP *group)
 {
-    int i = 0;
+    int i;
 
     if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
         NID_X9_62_characteristic_two_field)
         /* everything else is currently not supported */
         return 0;
 
-    while (group->poly[i] != 0)
-        i++;
+    /* Find the last non-zero element of group->poly[] */
+    for (i = 0;
+         i < (int)OSSL_NELEM(group->poly) & group->poly[i] != 0;
+         i++)
+        continue;
 
     if (i == 4)
         return NID_X9_62_ppBasis;