root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

s_cb.c: Move the negotiated group output 

It needs to be always displayed not just with -brief.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25959)
This commit is contained in:
Michael Baentsch 2024-11-15 09:49:43 +01:00 committed by Tomas Mraz
parent 4c41aa4b33
commit 1a077b38c9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/lib/s_cb.c
View File

@ -418,8 +418,13 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
{ {
EVP_PKEY *key; EVP_PKEY *key;
if (!SSL_get_peer_tmp_key(s, &key)) if (!SSL_get_peer_tmp_key(s, &key)) {
if (SSL_version(s) == TLS1_3_VERSION)
BIO_printf(out, "Negotiated TLS1.3 group: %s\n",
SSL_group_to_name(s, SSL_get_negotiated_group(s)));
return 1; return 1;
}
BIO_puts(out, "Server Temp Key: "); BIO_puts(out, "Server Temp Key: ");
switch (EVP_PKEY_get_id(key)) { switch (EVP_PKEY_get_id(key)) {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
@ -1327,12 +1332,8 @@ void print_ssl_summary(SSL *s)
if (SSL_is_server(s)) if (SSL_is_server(s))
ssl_print_groups(bio_err, s, 1); ssl_print_groups(bio_err, s, 1);
#endif #endif
if (!SSL_is_server(s)) { if (!SSL_is_server(s))
if (SSL_version(s) == TLS1_3_VERSION)
BIO_printf(bio_err, "Negotiated TLS1.3 group: %s\n",
SSL_group_to_name(s, SSL_get_negotiated_group(s)));
ssl_print_tmp_key(bio_err, s); ssl_print_tmp_key(bio_err, s);
}
} }
int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str, int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str,