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

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  c1abfde735eca6346eb2c0641b67b11d0e68b94c (commit)
      from  7fb37eed05059e1b135ef5818fb9f2b3b93b8daa (commit)


- Log -----------------------------------------------------------------
commit c1abfde735eca6346eb2c0641b67b11d0e68b94c
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Jun 2 16:05:37 2017 -0400

    Document default client -psk_identity
    
    Document that -psk is required to use PSK cipher
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/3607)
    (cherry picked from commit 9d772829c9e4f202460acb43f9e073841a7cb9db)

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

Summary of changes:
 doc/apps/s_client.pod | 2 ++
 doc/apps/s_server.pod | 1 +
 2 files changed, 3 insertions(+)

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 43989d0..b0d8814 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -346,12 +346,14 @@ Can be used to override the implicit B<-ign_eof> after B<-quiet>.
 =item B<-psk_identity identity>
 
 Use the PSK identity B<identity> when using a PSK cipher suite.
+The default value is "Client_identity" (without the quotes).
 
 =item B<-psk key>
 
 Use the PSK key B<key> when using a PSK cipher suite. The key is
 given as a hexadecimal number without leading 0x, for example -psk
 1a2b3c4d.
+This option must be provided in order to use a PSK cipher.
 
 =item B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>
 
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index ad71867..ee57f70 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -323,6 +323,7 @@ Use the PSK identity hint B<hint> when using a PSK cipher suite.
 Use the PSK key B<key> when using a PSK cipher suite. The key is
 given as a hexadecimal number without leading 0x, for example -psk
 1a2b3c4d.
+This option must be provided in order to use a PSK cipher.
 
 =item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>