===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/openssl.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/openssl/openssl.1	2014/11/07 13:13:08	1.5
--- src/usr.bin/openssl/openssl.1	2014/11/23 04:49:46	1.6
***************
*** 1,4 ****
! .\" $OpenBSD: openssl.1,v 1.5 2014/11/07 13:13:08 jsing Exp $
  .\" ====================================================================
  .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  .\"
--- 1,4 ----
! .\" $OpenBSD: openssl.1,v 1.6 2014/11/23 04:49:46 guenther Exp $
  .\" ====================================================================
  .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  .\"
***************
*** 112,118 ****
  .\"
  .\" OPENSSL
  .\"
! .Dd $Mdocdate: November 7 2014 $
  .Dt OPENSSL 1
  .Os
  .Sh NAME
--- 112,118 ----
  .\"
  .\" OPENSSL
  .\"
! .Dd $Mdocdate: November 23 2014 $
  .Dt OPENSSL 1
  .Os
  .Sh NAME
***************
*** 6610,6615 ****
--- 6610,6617 ----
  .Op Fl no_ssl3
  .Op Fl no_ticket
  .Op Fl no_tls1
+ .Op Fl no_tls1_1
+ .Op Fl no_tls1_2
  .Op Fl pause
  .Op Fl policy_check
  .Op Fl prexit
***************
*** 6729,6735 ****
  .It Fl nbio_test
  Tests non-blocking I/O.
  .It Xo
! .Fl no_ssl3 | no_tls1 |
  .Fl ssl3 | tls1
  .Xc
  These options disable the use of certain SSL or TLS protocols.
--- 6731,6737 ----
  .It Fl nbio_test
  Tests non-blocking I/O.
  .It Xo
! .Fl no_ssl3 | no_tls1 | no_tls1_1 | no_tls1_2 |
  .Fl ssl3 | tls1
  .Xc
  These options disable the use of certain SSL or TLS protocols.
***************
*** 6835,6843 ****
  .Pp
  If the handshake fails, there are several possible causes; if it is
  nothing obvious like no client certificate, then the
! .Fl bugs , ssl3 , tls1 , no_ssl3 ,
  and
! .Fl no_tls1
  options can be tried in case it is a buggy server.
  In particular these options should be tried
  .Em before
--- 6837,6845 ----
  .Pp
  If the handshake fails, there are several possible causes; if it is
  nothing obvious like no client certificate, then the
! .Fl bugs , ssl3 , tls1 , no_ssl3 , no_tls1 , no_tls1_1 ,
  and
! .Fl no_tls1_2
  options can be tried in case it is a buggy server.
  In particular these options should be tried
  .Em before
***************
*** 6921,6926 ****
--- 6923,6930 ----
  .Op Fl no_dhe
  .Op Fl no_ssl3
  .Op Fl no_tls1
+ .Op Fl no_tls1_1
+ .Op Fl no_tls1_2
  .Op Fl no_tmp_rsa
  .Op Fl nocert
  .Op Fl psk Ar key
***************
*** 7069,7075 ****
  If this option is set, no DH parameters will be loaded, effectively
  disabling the ephemeral DH cipher suites.
  .It Xo
! .Fl no_ssl3 | no_tls1 |
  .Fl ssl3 | tls1
  .Xc
  These options disable the use of certain SSL or TLS protocols.
--- 7073,7079 ----
  If this option is set, no DH parameters will be loaded, effectively
  disabling the ephemeral DH cipher suites.
  .It Xo
! .Fl no_ssl3 | no_tls1 | no_tls1_1 | no_tls1_2 |
  .Fl ssl3 | tls1
  .Xc
  These options disable the use of certain SSL or TLS protocols.