generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

document -nextprotoneg option in man pages

Browse Source 
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)
This commit is contained in:
Hubert Kario 2014-06-06 16:48:43 +02:00 committed by Dr. Stephen Henson
parent fa2b54c83a
commit cdae9a58e6
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/apps/s_client.pod
View File

@ -49,6 +49,7 @@ B<openssl> B<s_client>
[B<-rand file(s)>] [B<-rand file(s)>]
[B<-serverinfo types>] [B<-serverinfo types>]
[B<-status>] [B<-status>]
[B<-nextprotoneg protocols>]
=head1 DESCRIPTION =head1 DESCRIPTION
@ -273,6 +274,17 @@ file.
sends a certificate status request to the server (OCSP stapling). The server sends a certificate status request to the server (OCSP stapling). The server
response (if any) is printed out. 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 =back
=head1 CONNECTED COMMANDS =head1 CONNECTED COMMANDS

10
doc/apps/s_server.pod
View File

@ -61,6 +61,8 @@ B<openssl> B<s_server>
[B<-status_verbose>] [B<-status_verbose>]
[B<-status_timeout nsec>] [B<-status_timeout nsec>]
[B<-status_url url>] [B<-status_url url>]
[B<-nextprotoneg protocols>]
=head1 DESCRIPTION =head1 DESCRIPTION
The B<s_server> command implements a generic SSL/TLS server which listens The B<s_server> command implements a generic SSL/TLS server which listens
@ -317,6 +319,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 server certificate. Without this option an error is returned if the server
certificate does not contain a responder address. 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 =back
=head1 CONNECTED COMMANDS =head1 CONNECTED COMMANDS