[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  7b368cd6d964da817cd1de85fc0cae74372e0966 (commit)
      from  bf0404fe4afe9ed1e09e11b2b8f82b9ec127de91 (commit)


- Log -----------------------------------------------------------------
commit 7b368cd6d964da817cd1de85fc0cae74372e0966
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Sep 21 10:59:15 2016 -0400

    Dcoument -alpn flag
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit 776e15f9393a9e3083bec60a8da376ce2fe1e97e)

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/s_client.pod | 9 +++++++--
 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 34dcd29..7ad9811 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -95,6 +95,7 @@ B<openssl> B<s_client>
 [B<-rand file(s)>]
 [B<-serverinfo types>]
 [B<-status>]
+[B<-alpn protocols>]
 [B<-nextprotoneg protocols>]
 [B<-ct|noct>]
 [B<-ctlogfile>]
@@ -472,9 +473,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 bf4a4ab..b0d7888 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -100,6 +100,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
@@ -471,9 +472,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