[openssl] OpenSSL_1_1_0-stable update

[yang.yang at baishancloud.com]

The branch OpenSSL_1_1_0-stable has been updated
       via  3318493b85a8189f6385d5489f97f0e101471f92 (commit)
      from  f499873c2ff5a6da5f1a23c099730f97c822e90c (commit)


- Log -----------------------------------------------------------------
commit 3318493b85a8189f6385d5489f97f0e101471f92
Author: Jeff Mahoney <jeffm at suse.com>
Date:   Sun Feb 24 16:56:28 2019 +0800

    apps/speed: fix segfault while looking up algorithm name
    
    The backport of master commit 5c6a69f539a (apps/speed: fix possible OOB
    access in some EC arrays) as 1.1.0 commit 4e07941373a introduced a
    regression.  The ecdh_choices array is iterated using an element count
    but is NULL terminated.  This means that running 'openssl speed somealgo'
    will result in a segfault when opt_found hits the NULL entry.
    
    Fixes #8243
    
    CLA: trivial
    
    Signed-off-by: Jeff Mahoney <jeffm at suse.com>
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8244)

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

Summary of changes:
 apps/speed.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/speed.c b/apps/speed.c
index 6672fe6..4595cc6 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -537,7 +537,6 @@ static const OPT_PAIR ecdh_choices[] = {
     {"ecdhb409", R_EC_B409},
     {"ecdhb571", R_EC_B571},
     {"ecdhx25519", R_EC_X25519},
-    {NULL}
 };
 # define EC_NUM       OSSL_NELEM(ecdh_choices)