From 00579b98c44dcd0b7b7f7a44a498574a85b0d6f1 Mon Sep 17 00:00:00 2001 From: Hubert Kario Date: Fri, 6 Jun 2014 16:48:43 +0200 Subject: [PATCH] document -nextprotoneg option in man pages Add description of the option to advertise support of Next Protocol Negotiation extension (-nextprotoneg) to man pages of s_client and s_server. PR#3444 (cherry picked from commit 7efd0e777e65eaa6c60d85b1cc5c889f872f8fc4) Conflicts: doc/apps/s_server.pod --- doc/apps/s_client.pod | 12 ++++++++++++ doc/apps/s_server.pod | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod index 57b67f7c4..b021c730c 100644 --- a/doc/apps/s_client.pod +++ b/doc/apps/s_client.pod @@ -48,6 +48,7 @@ B B [B<-sess_in filename>] [B<-rand file(s)>] [B<-status>] +[B<-nextprotoneg protocols>] =head1 DESCRIPTION @@ -265,6 +266,17 @@ all others. sends a certificate status request to the server (OCSP stapling). The server response (if any) is printed out. +=item B<-nextprotoneg protocols> + +enable Next Protocol Negotiation TLS extension and provide a list of +comma-separated protocol names that the client should advertise +support for. The list should contain most wanted protocols first. +Protocol names are printable ASCII strings, for example "http/1.1" or +"spdy/3". +Empty list of protocols is treated specially and will cause the client to +advertise support for the TLS extension but disconnect just after +reciving ServerHello with a list of server supported protocols. + =back =head1 CONNECTED COMMANDS diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod index 319622f73..255d1a472 100644 --- a/doc/apps/s_server.pod +++ b/doc/apps/s_server.pod @@ -60,6 +60,7 @@ B B [B<-status_verbose>] [B<-status_timeout nsec>] [B<-status_url url>] +[B<-nextprotoneg protocols>] =head1 DESCRIPTION @@ -310,6 +311,14 @@ sets a fallback responder URL to use if no responder URL is present in the server certificate. Without this option an error is returned if the server certificate does not contain a responder address. +=item B<-nextprotoneg protocols> + +enable Next Protocol Negotiation TLS extension and provide a +comma-separated list of supported protocol names. +The list should contain most wanted protocols first. +Protocol names are printable ASCII strings, for example "http/1.1" or +"spdy/3". + =back =head1 CONNECTED COMMANDS