diff options
author | schwarze <> | 2016-11-21 11:48:44 +0000 |
---|---|---|
committer | schwarze <> | 2016-11-21 11:48:44 +0000 |
commit | 905a69c496ae2de5473c244b8f84ce2cdd16ed97 (patch) | |
tree | ffa0aae81fef90726db37afd2a44303fcf53b661 | |
parent | 7a097c0707042f6aad9d81556e906ee7b81321de (diff) | |
download | openbsd-905a69c496ae2de5473c244b8f84ce2cdd16ed97.tar.gz openbsd-905a69c496ae2de5473c244b8f84ce2cdd16ed97.tar.bz2 openbsd-905a69c496ae2de5473c244b8f84ce2cdd16ed97.zip |
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-- | src/lib/libcrypto/man/DH_set_method.3 | 87 |
1 files changed, 55 insertions, 32 deletions
diff --git a/src/lib/libcrypto/man/DH_set_method.3 b/src/lib/libcrypto/man/DH_set_method.3 index c20ea3b4e4..d9563f7ccd 100644 --- a/src/lib/libcrypto/man/DH_set_method.3 +++ b/src/lib/libcrypto/man/DH_set_method.3 | |||
@@ -1,6 +1,54 @@ | |||
1 | .\" $OpenBSD: DH_set_method.3,v 1.3 2016/11/12 19:23:16 jmc Exp $ | 1 | .\" $OpenBSD: DH_set_method.3,v 1.4 2016/11/21 11:48:44 schwarze Exp $ |
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | ||
2 | .\" | 3 | .\" |
3 | .Dd $Mdocdate: November 12 2016 $ | 4 | .\" This file was written by Ulf Moeller <ulf@openssl.org>. |
5 | .\" Copyright (c) 2000, 2002, 2007 The OpenSSL Project. All rights reserved. | ||
6 | .\" | ||
7 | .\" Redistribution and use in source and binary forms, with or without | ||
8 | .\" modification, are permitted provided that the following conditions | ||
9 | .\" are met: | ||
10 | .\" | ||
11 | .\" 1. Redistributions of source code must retain the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer. | ||
13 | .\" | ||
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
15 | .\" notice, this list of conditions and the following disclaimer in | ||
16 | .\" the documentation and/or other materials provided with the | ||
17 | .\" distribution. | ||
18 | .\" | ||
19 | .\" 3. All advertising materials mentioning features or use of this | ||
20 | .\" software must display the following acknowledgment: | ||
21 | .\" "This product includes software developed by the OpenSSL Project | ||
22 | .\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
23 | .\" | ||
24 | .\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | .\" endorse or promote products derived from this software without | ||
26 | .\" prior written permission. For written permission, please contact | ||
27 | .\" openssl-core@openssl.org. | ||
28 | .\" | ||
29 | .\" 5. Products derived from this software may not be called "OpenSSL" | ||
30 | .\" nor may "OpenSSL" appear in their names without prior written | ||
31 | .\" permission of the OpenSSL Project. | ||
32 | .\" | ||
33 | .\" 6. Redistributions of any form whatsoever must retain the following | ||
34 | .\" acknowledgment: | ||
35 | .\" "This product includes software developed by the OpenSSL Project | ||
36 | .\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
37 | .\" | ||
38 | .\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | .\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | .\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | .\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | .\" | ||
51 | .Dd $Mdocdate: November 21 2016 $ | ||
4 | .Dt DH_SET_METHOD 3 | 52 | .Dt DH_SET_METHOD 3 |
5 | .Os | 53 | .Os |
6 | .Sh NAME | 54 | .Sh NAME |
@@ -8,13 +56,10 @@ | |||
8 | .Nm DH_get_default_method , | 56 | .Nm DH_get_default_method , |
9 | .Nm DH_set_method , | 57 | .Nm DH_set_method , |
10 | .Nm DH_new_method , | 58 | .Nm DH_new_method , |
11 | .Nm DH_OpenSSL , | 59 | .Nm DH_OpenSSL |
12 | .Nm DH_set_default_openssl_method , | ||
13 | .Nm DH_get_default_openssl_method | ||
14 | .Nd select DH method | 60 | .Nd select DH method |
15 | .Sh SYNOPSIS | 61 | .Sh SYNOPSIS |
16 | .In openssl/dh.h | 62 | .In openssl/dh.h |
17 | .In openssl/engine.h | ||
18 | .Ft void | 63 | .Ft void |
19 | .Fo DH_set_default_method | 64 | .Fo DH_set_default_method |
20 | .Fa "const DH_METHOD *meth" | 65 | .Fa "const DH_METHOD *meth" |
@@ -116,7 +161,10 @@ is set, the | |||
116 | controlled by | 161 | controlled by |
117 | .Fn DH_set_default_method | 162 | .Fn DH_set_default_method |
118 | is used. | 163 | is used. |
119 | .Sh THE DH_METHOD STRUCTURE | 164 | .Pp |
165 | The | ||
166 | .Vt DH_METHOD | ||
167 | structure is defined as follows: | ||
120 | .Bd -literal | 168 | .Bd -literal |
121 | typedef struct dh_meth_st | 169 | typedef struct dh_meth_st |
122 | { | 170 | { |
@@ -181,31 +229,6 @@ Otherwise it returns a pointer to the newly allocated structure. | |||
181 | and | 229 | and |
182 | .Fn DH_OpenSSL | 230 | .Fn DH_OpenSSL |
183 | were added in OpenSSL 0.9.4. | 231 | were added in OpenSSL 0.9.4. |
184 | .Pp | ||
185 | .Fn DH_set_default_openssl_method | ||
186 | and | ||
187 | .Fn DH_get_default_openssl_method | ||
188 | replaced | ||
189 | .Fn DH_set_default_method | ||
190 | and | ||
191 | .Fn DH_get_default_method | ||
192 | respectively, and | ||
193 | .Fn DH_set_method | ||
194 | and | ||
195 | .Fn DH_new_method | ||
196 | were altered to use | ||
197 | .Vt ENGINE Ns s | ||
198 | rather than | ||
199 | .Vt DH_METHOD Ns s | ||
200 | during development of the engine version of OpenSSL 0.9.6. | ||
201 | For 0.9.7, the handling of defaults in the | ||
202 | .Xr engine 3 | ||
203 | API was restructured so that this change was reversed, and behaviour | ||
204 | of the other functions resembled more closely the previous behaviour. | ||
205 | The behaviour of defaults in the | ||
206 | .Xr engine 3 | ||
207 | API now transparently overrides the behaviour of defaults in the | ||
208 | DH API without requiring changing these function prototypes. | ||
209 | .Sh CAVEATS | 232 | .Sh CAVEATS |
210 | As of version 0.9.7, | 233 | As of version 0.9.7, |
211 | .Vt DH_METHOD | 234 | .Vt DH_METHOD |