From 84bafb747108486ea8e9716abb7a61285e9126ee Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 26 Nov 2012 18:39:38 +0000 Subject: [PATCH] Print out point format list for clients too. --- apps/s_cb.c | 4 +--- ssl/s3_lib.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/apps/s_cb.c b/apps/s_cb.c index aed718b1f6..0759c8a7c9 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -1565,11 +1565,9 @@ void print_ssl_summary(BIO *bio, SSL *s) BIO_puts(bio, "No peer certificate\n"); if (peer) X509_free(peer); + ssl_print_point_formats(bio, s); if (SSL_is_server(s)) - { - ssl_print_point_formats(bio, s); ssl_print_curves(bio, s, 1); - } else ssl_print_tmp_key(bio, s); } diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index c6ecd8ff00..6c09e43463 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3531,17 +3531,14 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) } case SSL_CTRL_GET_EC_POINT_FORMATS: - if (!s->server) + { + SSL_SESSION *sess = s->session; + const unsigned char **pformat = parg; + if (!sess || !sess->tlsext_ecpointformatlist) return 0; - else - { - SSL_SESSION *sess = s->session; - const unsigned char **pformat = parg; - if (!sess || !sess->tlsext_ecpointformatlist) - return 0; - *pformat = sess->tlsext_ecpointformatlist; - return (int)sess->tlsext_ecpointformatlist_length; - } + *pformat = sess->tlsext_ecpointformatlist; + return (int)sess->tlsext_ecpointformatlist_length; + } default: break; -- 2.25.1