diff options
| author | delphij <delphij@FreeBSD.org> | 2016-03-02 15:43:01 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-03-02 15:43:01 +0000 |
| commit | 73af9669cdc04af0c06344ce6f0d85808187eab3 (patch) | |
| tree | f76285aeef43941ffcb77e3220027526a2c2c421 /crypto/openssl/doc/apps/s_server.pod | |
| parent | 3b4b162df0228ed74a1e63eccc7315071254344f (diff) | |
| download | FreeBSD-src-73af9669cdc04af0c06344ce6f0d85808187eab3.zip FreeBSD-src-73af9669cdc04af0c06344ce6f0d85808187eab3.tar.gz | |
Merge OpenSSL 1.0.1s. This is a security update.
Relnotes: yes
Approved by: re (so@ implicit)
Diffstat (limited to 'crypto/openssl/doc/apps/s_server.pod')
| -rw-r--r-- | crypto/openssl/doc/apps/s_server.pod | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssl/doc/apps/s_server.pod b/crypto/openssl/doc/apps/s_server.pod index 491038e..ca5cb72 100644 --- a/crypto/openssl/doc/apps/s_server.pod +++ b/crypto/openssl/doc/apps/s_server.pod @@ -221,11 +221,11 @@ 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. -=item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1> +=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> -these options disable the use of certain SSL or TLS protocols. By default -the initial handshake uses a method which should be compatible with all -servers and permit them to use SSL v3, SSL v2 or TLS as appropriate. +These options require or disable the use of the specified SSL or TLS protocols. +By default the initial handshake uses a I<version-flexible> method which will +negotiate the highest mutually supported protocol version. =item B<-bugs> |
