Make no-ec compilation work.

(cherry picked from commit 14536c8c9c)
This commit is contained in:
Dr. Stephen Henson
2013-08-17 17:40:08 +01:00
parent 171c4da568
commit 5b430cfc44
8 changed files with 75 additions and 22 deletions

View File

@@ -2555,7 +2555,10 @@ static int init_ssl_connection(SSL *con)
BIO_printf(bio_s_out,"Shared ciphers:%s\n",buf);
str=SSL_CIPHER_get_name(SSL_get_current_cipher(con));
ssl_print_sigalgs(bio_s_out, con);
#ifndef OPENSSL_NO_EC
ssl_print_point_formats(bio_s_out, con);
ssl_print_curves(bio_s_out, con, 0);
#endif
BIO_printf(bio_s_out,"CIPHER is %s\n",(str != NULL)?str:"(NONE)");
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
@@ -2875,7 +2878,9 @@ static int www_body(char *hostname, int s, unsigned char *context)
BIO_puts(io,"\n");
}
ssl_print_sigalgs(io, con);
#ifndef OPENSSL_NO_EC
ssl_print_curves(io, con, 0);
#endif
BIO_printf(io,(SSL_cache_hit(con)
?"---\nReused, "
:"---\nNew, "));