[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0acee5045aa5d07242b02ce6fb7ab88a920799c6 (commit)
      from  8c55c4614731487449a02f90ff9a209ff6c63447 (commit)


- Log -----------------------------------------------------------------
commit 0acee5045aa5d07242b02ce6fb7ab88a920799c6
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Tue Mar 21 16:30:21 2017 -0500

    Further de-obfuscation
    
    A similar change that probably should have been wrapped into
    commit e0926ef49df09a85117d7442db83f321aeb5b982.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3010)

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

Summary of changes:
 ssl/statem/statem_lib.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 19d4b46..0cde2e7 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -1933,12 +1933,11 @@ int check_in_list(SSL *s, unsigned int group_id, const unsigned char *groups,
         if (group_id == share_id
                 && (!checkallow
                     || tls_curve_allowed(s, groups, SSL_SECOP_CURVE_CHECK))) {
-            break;
+            return 1;
         }
     }
 
-    /* If i == num_groups then not in the list */
-    return i < num_groups;
+    return 0;
 }
 #endif