diff options
author | Rich Salz <rsalz@openssl.org> | 2017-06-02 16:05:37 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-06-05 14:13:50 -0400 |
commit | 9d772829c9e4f202460acb43f9e073841a7cb9db (patch) | |
tree | c905a75d37965ba1b224c807ab68657dafcb3c8a | |
parent | 720b6cbe4a195fc5563be2334e8519a61b82eeef (diff) |
Document default client -psk_identity
Document that -psk is required to use PSK cipher
[skip ci]
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3607)
-rw-r--r-- | doc/man1/s_client.pod | 2 | ||||
-rw-r--r-- | doc/man1/s_server.pod | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod index 882f74b418..5414ffa41e 100644 --- a/doc/man1/s_client.pod +++ b/doc/man1/s_client.pod @@ -378,12 +378,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<-tls1_3>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>, B<-no_tls1_3> diff --git a/doc/man1/s_server.pod b/doc/man1/s_server.pod index b5245d8b4d..db712f90e9 100644 --- a/doc/man1/s_server.pod +++ b/doc/man1/s_server.pod @@ -344,6 +344,7 @@ identity is the string "Client_identity". 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<-tls1_3>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>, B<-no_tls1_3> |