diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-09-21 10:59:15 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-09-21 11:24:59 -0400 |
| commit | 62841a2350f76a5207376d581acec319196447d7 (patch) | |
| tree | 4179fb971fee2412937911e53b8eecfdc941e81a | |
| parent | ceb7342dab3ab0827b3e13dd9a367d31c7bc3f43 (diff) | |
Dcoument -alpn flag
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 776e15f9393a9e3083bec60a8da376ce2fe1e97e)
| -rw-r--r-- | doc/apps/s_client.pod | 9 | ||||
| -rw-r--r-- | doc/apps/s_server.pod | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod index 618df9659d..29675dd213 100644 --- a/doc/apps/s_client.pod +++ b/doc/apps/s_client.pod @@ -53,6 +53,7 @@ B<openssl> B<s_client> [B<-rand file(s)>] [B<-serverinfo types>] [B<-status>] +[B<-alpn protocols>] [B<-nextprotoneg protocols>] =head1 DESCRIPTION @@ -277,9 +278,13 @@ file. sends a certificate status request to the server (OCSP stapling). The server response (if any) is printed out. -=item B<-nextprotoneg protocols> +=item B<-alpn protocols>, B<-nextprotoneg protocols> -enable Next Protocol Negotiation TLS extension and provide a list of +these flags enable the +Enable the Application-Layer Protocol Negotiation or Next Protocol +Negotiation extension, respectively. ALPN is the IETF standard and +replaces NPN. +The B<protocols> list is a 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 diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod index 6f4acb7006..fa17488d91 100644 --- a/doc/apps/s_server.pod +++ b/doc/apps/s_server.pod @@ -62,6 +62,7 @@ B<openssl> B<s_server> [B<-status_verbose>] [B<-status_timeout nsec>] [B<-status_url url>] +[B<-alpn protocols>] [B<-nextprotoneg protocols>] =head1 DESCRIPTION @@ -327,9 +328,13 @@ 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> +=item B<-alpn protocols>, B<-nextprotoneg protocols> -enable Next Protocol Negotiation TLS extension and provide a +these flags enable the +Enable the Application-Layer Protocol Negotiation or Next Protocol +Negotiation extension, respectively. ALPN is the IETF standard and +replaces NPN. +The B<protocols> list is 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 |