From e5da0373f5482b4e70742e9a71419ed3e009f96b Mon Sep 17 00:00:00 2001 From: schwarze <> Date: Mon, 5 Dec 2016 20:37:08 +0000 Subject: Add Copyright and license. Update a cross reference, from OpenSSL. --- src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 | 61 ++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 7 deletions(-) (limited to 'src/lib/libcrypto') diff --git a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 index 0e6c2923ef..05a774ea1e 100644 --- a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 +++ b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 @@ -1,6 +1,54 @@ -.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.2 2016/11/06 15:52:50 jmc Exp $ +.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.3 2016/12/05 20:37:08 schwarze Exp $ +.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" -.Dd $Mdocdate: November 6 2016 $ +.\" This file was written by Dr. Stephen Henson . +.\" Copyright (c) 2002, 2016 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: December 5 2016 $ .Dt D2I_PKCS8PRIVATEKEY_BIO 3 .Os .Sh NAME @@ -73,10 +121,9 @@ using both PKCS#5 v1.5 and PKCS#5 v2.0 password based encryption algorithms. .Pp Other than the use of DER as opposed to PEM these functions are -identical to the corresponding -.Xr pem 3 -functions. -.Sh NOTES +identical to the corresponding functions described in +.Xr PEM_read_PrivateKey 3 . +.Pp Before using these functions, .Xr OpenSSL_add_all_algorithms 3 should be called to initialize the internal algorithm lookup tables. @@ -96,4 +143,4 @@ memory BIOs, see .Xr BIO_s_mem 3 for details. .Sh SEE ALSO -.Xr pem 3 +.Xr PEM_read_PrivateKey 3 -- cgit v1.2.3-55-g6feb