If we couldn't handle "-showcerts" (which happens with the current

SSL2 implementation), show at least the server certificate.

diff --git a/apps/s_client.c b/apps/s_client.c
index cea00788a6a75dbc99ae8681296c5c7ef16a6195..1fa157573a743751cf32436754652b8bc9f7f8d3 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -688,9 +688,13 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 
        if (full)
                {
+               int got_a_chain = 0;
+
                sk=SSL_get_peer_cert_chain(s);
                if (sk != NULL)
                        {
+                       got_a_chain = 1; /* we don't have it for SSL2 (yet) */
+
                        BIO_printf(bio,"---\nCertificate chain\n");
                        for (i=0; i<sk_X509_num(sk); i++)
                                {
@@ -710,7 +714,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
                if (peer != NULL)
                        {
                        BIO_printf(bio,"Server certificate\n");
-                       if (!c_showcerts) /* Redundant if we showed the whole chain */
+                       if (!(c_showcerts && got_a_chain)) /* Redundant if we showed the whole chain */
                                PEM_write_bio_X509(bio,peer);
                        X509_NAME_oneline(X509_get_subject_name(peer),
                                buf,BUFSIZ);