[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  19044d3c22ffcb711e62db11634476917a0a58d9 (commit)
      from  d88ab353d3f94031d56d2d6451695eac305c9738 (commit)


- Log -----------------------------------------------------------------
commit 19044d3c22ffcb711e62db11634476917a0a58d9
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 25 14:37:25 2017 +0100

    Add documentation for the -sctp option in command line apps
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3305)

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

Summary of changes:
 doc/man1/s_client.pod | 7 +++++++
 doc/man1/s_server.pod | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod
index 272d997..cc2ad4f 100644
--- a/doc/man1/s_client.pod
+++ b/doc/man1/s_client.pod
@@ -82,6 +82,7 @@ B<openssl> B<s_client>
 [B<-dtls>]
 [B<-dtls1>]
 [B<-dtls1_2>]
+[B<-sctp>]
 [B<-fallback_scsv>]
 [B<-async>]
 [B<-split_send_frag>]
@@ -387,6 +388,12 @@ With B<-dtls>, B<s_client> will negotiate any supported DTLS protocol version,
 whilst B<-dtls1> and B<-dtls1_2> will only support DTLS1.0 and DTLS1.2
 respectively.
 
+=item B<-sctp>
+
+Use SCTP for the transport protocol instead of UDP in DTLS. Must be used in
+conjunction with B<-dtls>, B<-dtls1> or B<-dtls1_2>. This option is only
+available where OpenSSL has support for SCTP enabled.
+
 =item B<-fallback_scsv>
 
 Send TLS_FALLBACK_SCSV in the ClientHello.
diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod
index 838ce2d..d2fbb84 100644
--- a/doc/man1/s_server.pod
+++ b/doc/man1/s_server.pod
@@ -83,6 +83,7 @@ B<openssl> B<s_server>
 [B<-dtls>]
 [B<-dtls1>]
 [B<-dtls1_2>]
+[B<-sctp>]
 [B<-listen>]
 [B<-async>]
 [B<-split_send_frag>]
@@ -362,6 +363,12 @@ Any without a cookie will be responded to with a HelloVerifyRequest.
 If a ClientHello with a cookie is received then B<s_server> will connect to
 that peer and complete the handshake.
 
+=item B<-sctp>
+
+Use SCTP for the transport protocol instead of UDP in DTLS. Must be used in
+conjunction with B<-dtls>, B<-dtls1> or B<-dtls1_2>. This option is only
+available where OpenSSL has support for SCTP enabled.
+
 =item B<-async>
 
 Switch on asynchronous mode. Cryptographic operations will be performed