diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-11-21 11:48:45 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-11-21 11:48:45 +0000 |
commit | 8c8e76225270760b944c57270206397429aaef96 (patch) | |
tree | 36daf394606367ceaadcdd2f6405e2ebb15c04c1 | |
parent | 85705d1e816da1cea69d8e1746378d81eabd13f8 (diff) |
Add Copyright and license.
Do not talk about DH_set_default_openssl_method() and
DH_get_default_openssl_method(). They were short-lived
functions that only existed in OpenSSL 0.9.6.
Remove inclusion of a header that is not needed (from OpenSSL).
Remove one ugly custom section header.
-rw-r--r-- | lib/libcrypto/man/DH_set_method.3 | 87 |
1 files changed, 55 insertions, 32 deletions
diff --git a/lib/libcrypto/man/DH_set_method.3 b/lib/libcrypto/man/DH_set_method.3 index c20ea3b4e4d..d9563f7ccde 100644 --- a/lib/libcrypto/man/DH_set_method.3 +++ b/lib/libcrypto/man/DH_set_method.3 @@ -1,6 +1,54 @@ -.\" $OpenBSD: DH_set_method.3,v 1.3 2016/11/12 19:23:16 jmc Exp $ +.\" $OpenBSD: DH_set_method.3,v 1.4 2016/11/21 11:48:44 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 DH_SET_METHOD 3 .Os .Sh NAME @@ -8,13 +56,10 @@ .Nm DH_get_default_method , .Nm DH_set_method , .Nm DH_new_method , -.Nm DH_OpenSSL , -.Nm DH_set_default_openssl_method , -.Nm DH_get_default_openssl_method +.Nm DH_OpenSSL .Nd select DH method .Sh SYNOPSIS .In openssl/dh.h -.In openssl/engine.h .Ft void .Fo DH_set_default_method .Fa "const DH_METHOD *meth" @@ -116,7 +161,10 @@ is set, the controlled by .Fn DH_set_default_method is used. -.Sh THE DH_METHOD STRUCTURE +.Pp +The +.Vt DH_METHOD +structure is defined as follows: .Bd -literal typedef struct dh_meth_st { @@ -181,31 +229,6 @@ Otherwise it returns a pointer to the newly allocated structure. and .Fn DH_OpenSSL were added in OpenSSL 0.9.4. -.Pp -.Fn DH_set_default_openssl_method -and -.Fn DH_get_default_openssl_method -replaced -.Fn DH_set_default_method -and -.Fn DH_get_default_method -respectively, and -.Fn DH_set_method -and -.Fn DH_new_method -were altered to use -.Vt ENGINE Ns s -rather than -.Vt DH_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 -DH API without requiring changing these function prototypes. .Sh CAVEATS As of version 0.9.7, .Vt DH_METHOD |