[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  d25aeabca8341d6489cfea2c29b263aa581e3dc7 (commit)
      from  6c3b566497d3147f3d701268d5280596ba9974d8 (commit)


- Log -----------------------------------------------------------------
commit d25aeabca8341d6489cfea2c29b263aa581e3dc7
Author: Ben Laurie <ben at links.org>
Date:   Sun Dec 13 15:07:54 2015 +0000

    Don't use EC when no-ec.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/t1_trce.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 6f5bed7..80d0bf8 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -1068,6 +1068,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
             return 0;
         break;
 
+#ifndef OPENSSL_NO_EC
     case SSL_kECDHE:
     case SSL_kECDHEPSK:
         if (msglen < 1)
@@ -1093,6 +1094,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
             return 0;
         }
         break;
+#endif
 
     case SSL_kPSK:
     case SSL_kRSAPSK: