From: erbsland-dev <github@erbsland.dev>
Date: Wed, 17 Jul 2024 21:21:42 +0000 (+0200)
Subject: Enhance s_client Output
X-Git-Tag: openssl-3.4.0-alpha1~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6993a625c3050125d8b69bcca05ef37555ebb3;p=thirdparty%2Fopenssl.git

Enhance s_client Output

Fixes #8123: Clarify cipher and protocol version display
- Added a new line “Protocol:” to display the protocol version separately after the cipher line.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24921)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 506048818b6..294f0915de4 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -3486,6 +3486,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
     c = SSL_get_current_cipher(s);
     BIO_printf(bio, "%s, Cipher is %s\n",
                SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
+    BIO_printf(bio, "Protocol: %s\n", SSL_get_version(s));
     if (peer != NULL) {
         EVP_PKEY *pktmp;