Print CA names in s_server, add -requestCAfile to s_client

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 12792e9643ffc0a4c5f83a36898c10e91b7f78df..4bd2620c9fa71b4b502519ca27ef51e9f31b11a9 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -138,9 +138,14 @@ static const char *session_id_prefix = NULL;
 #ifndef OPENSSL_NO_DTLS
 static int enable_timeouts = 0;
 static long socket_mtu;
 #ifndef OPENSSL_NO_DTLS
 static int enable_timeouts = 0;
 static long socket_mtu;

-static int dtlslisten = 0;

 #endif
 
 #endif
 

+/*
+ * We define this but make it always be 0 in no-dtls builds to simplify the
+ * code.
+ */
+static int dtlslisten = 0;
+

 static int early_data = 0;
 
 #ifndef OPENSSL_NO_PSK
 static int early_data = 0;
 
 #ifndef OPENSSL_NO_PSK


@@ -2699,6 +2704,7 @@ static void print_connection_info(SSL *con)
     ssl_print_point_formats(bio_s_out, con);
     ssl_print_groups(bio_s_out, con, 0);
 #endif
     ssl_print_point_formats(bio_s_out, con);
     ssl_print_groups(bio_s_out, con, 0);
 #endif

+    print_ca_names(bio_s_out, con);

     BIO_printf(bio_s_out, "CIPHER is %s\n", (str != NULL) ? str : "(NONE)");
 
 #if !defined(OPENSSL_NO_NEXTPROTONEG)
     BIO_printf(bio_s_out, "CIPHER is %s\n", (str != NULL) ? str : "(NONE)");
 
 #if !defined(OPENSSL_NO_NEXTPROTONEG)


@@ -2985,6 +2991,7 @@ static int www_body(int s, int stype, unsigned char *context)
 #ifndef OPENSSL_NO_EC
             ssl_print_groups(io, con, 0);
 #endif
 #ifndef OPENSSL_NO_EC
             ssl_print_groups(io, con, 0);
 #endif

+            print_ca_names(io, con);

             BIO_printf(io, (SSL_session_reused(con)
                             ? "---\nReused, " : "---\nNew, "));
             c = SSL_get_current_cipher(con);
             BIO_printf(io, (SSL_session_reused(con)
                             ? "---\nReused, " : "---\nNew, "));
             c = SSL_get_current_cipher(con);