diff options
| author | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-12-03 21:13:35 +0000 |
| commit | 8d77ecefb78a0e7ec702cf614a78dd85de9395ee (patch) | |
| tree | ade84397c16fe1b20cb2a441f603826e49c36cf2 /crypto/openssl/apps/s_client.c | |
| parent | 5374819b03f4e6dcb332bf2729f9270e5d10b83a (diff) | |
| parent | afd52a5fc90e70242dbb0e7d29987c976eb993e0 (diff) | |
| download | FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.zip FreeBSD-src-8d77ecefb78a0e7ec702cf614a78dd85de9395ee.tar.gz | |
Merge OpenSSL 1.0.2e.
Diffstat (limited to 'crypto/openssl/apps/s_client.c')
| -rw-r--r-- | crypto/openssl/apps/s_client.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/crypto/openssl/apps/s_client.c b/crypto/openssl/apps/s_client.c index e55f2c5..f80711f 100644 --- a/crypto/openssl/apps/s_client.c +++ b/crypto/openssl/apps/s_client.c @@ -424,6 +424,14 @@ static void sc_usage(void) " -no_ticket - disable use of RFC4507bis session tickets\n"); BIO_printf(bio_err, " -serverinfo types - send empty ClientHello extensions (comma-separated numbers)\n"); + BIO_printf(bio_err, + " -curves arg - Elliptic curves to advertise (colon-separated list)\n"); + BIO_printf(bio_err, + " -sigalgs arg - Signature algorithms to support (colon-separated list)\n"); + BIO_printf(bio_err, + " -client_sigalgs arg - Signature algorithms to support for client\n"); + BIO_printf(bio_err, + " certificate authentication (colon-separated list)\n"); #endif #ifndef OPENSSL_NO_NEXTPROTONEG BIO_printf(bio_err, @@ -2065,6 +2073,9 @@ int MAIN(int argc, char **argv) sk_X509_pop_free(chain, X509_free); if (pass) OPENSSL_free(pass); +#ifndef OPENSSL_NO_SRP + OPENSSL_free(srp_arg.srppassin); +#endif if (vpm) X509_VERIFY_PARAM_free(vpm); ssl_excert_free(exc); |
