[BACK]Return to openssl.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/openssl.1 between version 1.5 and 1.6

version 1.5, 2014/11/07 13:13:08 version 1.6, 2014/11/23 04:49:46
Line 6610 
Line 6610 
 .Op Fl no_ssl3  .Op Fl no_ssl3
 .Op Fl no_ticket  .Op Fl no_ticket
 .Op Fl no_tls1  .Op Fl no_tls1
   .Op Fl no_tls1_1
   .Op Fl no_tls1_2
 .Op Fl pause  .Op Fl pause
 .Op Fl policy_check  .Op Fl policy_check
 .Op Fl prexit  .Op Fl prexit
Line 6729 
Line 6731 
 .It Fl nbio_test  .It Fl nbio_test
 Tests non-blocking I/O.  Tests non-blocking I/O.
 .It Xo  .It Xo
 .Fl no_ssl3 | no_tls1 |  .Fl no_ssl3 | no_tls1 | no_tls1_1 | no_tls1_2 |
 .Fl ssl3 | tls1  .Fl ssl3 | tls1
 .Xc  .Xc
 These options disable the use of certain SSL or TLS protocols.  These options disable the use of certain SSL or TLS protocols.
Line 6835 
Line 6837 
 .Pp  .Pp
 If the handshake fails, there are several possible causes; if it is  If the handshake fails, there are several possible causes; if it is
 nothing obvious like no client certificate, then the  nothing obvious like no client certificate, then the
 .Fl bugs , ssl3 , tls1 , no_ssl3 ,  .Fl bugs , ssl3 , tls1 , no_ssl3 , no_tls1 , no_tls1_1 ,
 and  and
 .Fl no_tls1  .Fl no_tls1_2
 options can be tried in case it is a buggy server.  options can be tried in case it is a buggy server.
 In particular these options should be tried  In particular these options should be tried
 .Em before  .Em before
Line 6921 
Line 6923 
 .Op Fl no_dhe  .Op Fl no_dhe
 .Op Fl no_ssl3  .Op Fl no_ssl3
 .Op Fl no_tls1  .Op Fl no_tls1
   .Op Fl no_tls1_1
   .Op Fl no_tls1_2
 .Op Fl no_tmp_rsa  .Op Fl no_tmp_rsa
 .Op Fl nocert  .Op Fl nocert
 .Op Fl psk Ar key  .Op Fl psk Ar key
Line 7069 
Line 7073 
 If this option is set, no DH parameters will be loaded, effectively  If this option is set, no DH parameters will be loaded, effectively
 disabling the ephemeral DH cipher suites.  disabling the ephemeral DH cipher suites.
 .It Xo  .It Xo
 .Fl no_ssl3 | no_tls1 |  .Fl no_ssl3 | no_tls1 | no_tls1_1 | no_tls1_2 |
 .Fl ssl3 | tls1  .Fl ssl3 | tls1
 .Xc  .Xc
 These options disable the use of certain SSL or TLS protocols.  These options disable the use of certain SSL or TLS protocols.

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6