[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  187753e09ceab4c85a0041844e749658e8f712d3 (commit)
      from  5e58733b23fd33f526fb95ae636daf7ebf023359 (commit)


- Log -----------------------------------------------------------------
commit 187753e09ceab4c85a0041844e749658e8f712d3
Author: raja-ashok <rashok.svks at gmail.com>
Date:   Wed Oct 16 17:15:03 2019 +0530

    Fix leak with no-ec config
    
    Reviewed-by: Paul Yang <kaishen.yy at antfin.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10194)

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

Summary of changes:
 ssl/ssl_lib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index c481e292fc..794af76530 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1195,9 +1195,9 @@ void SSL_free(SSL *s)
 #ifndef OPENSSL_NO_EC
     OPENSSL_free(s->ext.ecpointformats);
     OPENSSL_free(s->ext.peer_ecpointformats);
+#endif                          /* OPENSSL_NO_EC */
     OPENSSL_free(s->ext.supportedgroups);
     OPENSSL_free(s->ext.peer_supportedgroups);
-#endif                          /* OPENSSL_NO_EC */
     sk_X509_EXTENSION_pop_free(s->ext.ocsp.exts, X509_EXTENSION_free);
 #ifndef OPENSSL_NO_OCSP
     sk_OCSP_RESPID_pop_free(s->ext.ocsp.ids, OCSP_RESPID_free);
@@ -3291,8 +3291,8 @@ void SSL_CTX_free(SSL_CTX *a)
 
 #ifndef OPENSSL_NO_EC
     OPENSSL_free(a->ext.ecpointformats);
-    OPENSSL_free(a->ext.supportedgroups);
 #endif
+    OPENSSL_free(a->ext.supportedgroups);
     OPENSSL_free(a->ext.alpn);
     OPENSSL_secure_free(a->ext.secure);