1 files changed, 55 insertions, 31 deletions

diff --git a/src/lib/libcrypto/man/DSA_set_method.3 b/src/lib/libcrypto/man/DSA_set_method.3
index 8266e1abad..56f22479d0 100644
--- a/src/lib/libcrypto/man/DSA_set_method.3
+++ b/src/lib/libcrypto/man/DSA_set_method.3
@@ -1,6 +1,54 @@
-.\"     $OpenBSD: DSA_set_method.3,v 1.3 2016/11/12 19:23:16 jmc Exp $
+.\"     $OpenBSD: DSA_set_method.3,v 1.4 2016/11/21 13:03:22 schwarze Exp $
+.\"     OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
-.Dd $Mdocdate: November 12 2016 $
+.\" This file was written by Ulf Moeller <ulf@openssl.org>.
+.\" Copyright (c) 2000, 2002, 2007 The OpenSSL Project.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. All advertising materials mentioning features or use of this
+.\"    software must display the following acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+.\"
+.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For written permission, please contact
+.\"    openssl-core@openssl.org.
+.\"
+.\" 5. Products derived from this software may not be called "OpenSSL"
+.\"    nor may "OpenSSL" appear in their names without prior written
+.\"    permission of the OpenSSL Project.
+.\"
+.\" 6. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+.\" OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: November 21 2016 $
 .Dt DSA_SET_METHOD 3
 .Os
 .Sh NAME
@@ -8,9 +56,7 @@
 .Nm DSA_get_default_method ,
 .Nm DSA_set_method ,
 .Nm DSA_new_method ,
-.Nm DSA_OpenSSL ,
-.Nm DSA_set_default_openssl_method ,
-.Nm DSA_get_default_openssl_method
+.Nm DSA_OpenSSL
 .Nd select DSA method
 .Sh SYNOPSIS
 .In openssl/dsa.h
@@ -107,7 +153,10 @@ is set, the
 controlled by
 .Fn DSA_set_default_method
 is used.
-.Sh THE DSA_METHOD STRUCTURE
+.Pp
+The
+.Vt DSA_METHOD
+structure is defined as follows:
 .Bd -literal
 struct
 {
@@ -184,31 +233,6 @@ Otherwise it returns a pointer to the newly allocated structure.
 and
 .Fn DSA_OpenSSL
 were added in OpenSSL 0.9.4.
-.Pp
-.Fn DSA_set_default_openssl_method
-and
-.Fn DSA_get_default_openssl_method
-replaced
-.Fn DSA_set_default_method
-and
-.Fn DSA_get_default_method
-respectively, and
-.Fn DSA_set_method
-and
-.Fn DSA_new_method
-were altered to use
-.Vt ENGINE Ns s
-rather than
-.Vt DSA_METHOD Ns s
-during development of the engine version of OpenSSL 0.9.6.
-For 0.9.7, the handling of defaults in the
-.Xr engine 3
-API was restructured so that this change was reversed, and behaviour
-of the other functions resembled more closely the previous behaviour.
-The behaviour of defaults in the
-.Xr engine 3
-API now transparently overrides the behaviour of defaults in the
-DSA API without requiring changing these function prototypes.
 .Sh CAVEATS
 As of version 0.9.7, DSA_METHOD implementations are grouped together
 with other algorithmic APIs (e.g. RSA_METHOD, EVP_CIPHER) in