Commit c1abfde7 authored Jun 02, 2017 by Rich Salz

Document default client -psk_identity



Document that -psk is required to use PSK cipher

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3607)
(cherry picked from commit 9d772829)

parent 7fb37eed

doc/apps/s_client.pod

+2 −0

Original line number	Diff line number	Diff line
		@@ -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>

doc/apps/s_server.pod

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>