[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  9da34ad6cb09e8f57093da5003839894b09fb701 (commit)
      from  a63d3ac012f4a1c3e7440dc9d419d8bc6041ee46 (commit)


- Log -----------------------------------------------------------------
commit 9da34ad6cb09e8f57093da5003839894b09fb701
Author: John Foley <foleyj at cisco.com>
Date:   Tue Apr 7 23:05:05 2015 +0100

    Fix intermittent s_server issues with ECDHE
    
    Resolve a problem when using s_server with ECDHE cipher
    suites in OpenSSL_1_0_1-stable.  Due to an uninitialized variable,
    SSL_CTX_set_tmp_ecdh() is not always invoked within s_server. This bug
    appears to have been introduced by
    059907771b89549cbd07a81df1a5bdf51e062066.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 apps/s_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index 1220f49..35b4061 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -998,7 +998,7 @@ int MAIN(int argc, char *argv[])
     int off = 0;
     int no_tmp_rsa = 0, no_dhe = 0, nocert = 0;
 #ifndef OPENSSL_NO_ECDH
-    int no_ecdhe;
+    int no_ecdhe = 0;
 #endif
     int state = 0;
     const SSL_METHOD *meth = NULL;