From 0c5c64115072a77dc257bf0bcb85d47f177fdca4 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Fri, 2 Jun 2017 16:05:37 -0400 Subject: [PATCH] Document default client -psk_identity Document that -psk is required to use PSK cipher Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/3607) (cherry picked from commit 9d772829c9e4f202460acb43f9e073841a7cb9db) (cherry picked from commit c1abfde735eca6346eb2c0641b67b11d0e68b94c) --- 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 b45acbc5e3..50ae1f8a7e 100644 --- a/doc/apps/s_client.pod +++ b/doc/apps/s_client.pod @@ -197,12 +197,14 @@ Can be used to override the implicit B<-ign_eof> after B<-quiet>. =item B<-psk_identity identity> Use the PSK identity B when using a PSK cipher suite. +The default value is "Client_identity" (without the quotes). =item B<-psk key> Use the PSK key B 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> diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod index 1fe93ddfbe..414efa860a 100644 --- a/doc/apps/s_server.pod +++ b/doc/apps/s_server.pod @@ -219,6 +219,7 @@ Use the PSK identity hint B when using a PSK cipher suite. Use the PSK key B 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> -- 2.25.1