Print out point format list for clients too.

diff --git a/apps/s_cb.c b/apps/s_cb.c
index aed718b1f648825464425d8d879f9bceba319d51..0759c8a7c9f8f0bbd2fb98e01da1c727733b7a03 100644 (file)
--- 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);
                BIO_puts(bio, "No peer certificate\n");
        if (peer)
                X509_free(peer);

+       ssl_print_point_formats(bio, s);

        if (SSL_is_server(s))
        if (SSL_is_server(s))

-               {
-               ssl_print_point_formats(bio, s);

                ssl_print_curves(bio, s, 1);
                ssl_print_curves(bio, s, 1);

-               }

        else
                ssl_print_tmp_key(bio, s);
        }
        else
                ssl_print_tmp_key(bio, s);
        }

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index c6ecd8ff00b65f5e9403f20f6aaa67a868198eb7..6c09e43463cda7c3b79445c6cc6e0da8811f834a 100644 (file)
--- 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:
                        }
 
        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;
                        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;
 
        default:
                break;