diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2016-03-01 14:03:58 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2016-03-01 18:29:20 +0100 |
| commit | 32719950df8e792684a49b89fe03a00bf65c7010 (patch) | |
| tree | 04a2aca536b988902c4dae21d7d5d9c956b26d59 /deps/openssl/openssl/doc/apps/s_server.pod | |
| parent | a7e49c886f5cb8c351673f413dc66086ff1d75bc (diff) | |
| download | android-node-v8-32719950df8e792684a49b89fe03a00bf65c7010.tar.gz android-node-v8-32719950df8e792684a49b89fe03a00bf65c7010.tar.bz2 android-node-v8-32719950df8e792684a49b89fe03a00bf65c7010.zip | |
deps: upgrade openssl to 1.0.2g
PR-URL: https://github.com/nodejs/node/pull/5507
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/openssl/openssl/doc/apps/s_server.pod')
| -rw-r--r-- | deps/openssl/openssl/doc/apps/s_server.pod | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/openssl/openssl/doc/apps/s_server.pod b/deps/openssl/openssl/doc/apps/s_server.pod index baca779244..6f4acb7006 100644 --- a/deps/openssl/openssl/doc/apps/s_server.pod +++ b/deps/openssl/openssl/doc/apps/s_server.pod @@ -217,11 +217,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> |