import PEM_bytes_read_bio(3) from OpenSSL,

dropping the secmem stuff that we don't want
author: schwarze <> 2017-08-20 20:15:13 +0000
committer: schwarze <> 2017-08-20 20:15:13 +0000
commit: 9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e (patch)
tree: 65e2853b32a662d91ae3e94cc24c9f212651aace
parent: b5ea9bef8120121305f3090c75a027833140f5d6 (diff)
download: openbsd-9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e.tar.gz
openbsd-9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e.tar.bz2
openbsd-9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e.zip
4 files changed, 124 insertions, 7 deletions
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 733e6730ab..66144c8231 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.122 2017/08/20 19:21:20 schwarze Exp $
+# $OpenBSD: Makefile,v 1.123 2017/08/20 20:15:13 schwarze Exp $
 .include <bsd.own.mk>
@@ -151,6 +151,7 @@ MAN=	\
        OPENSSL_load_builtin_modules.3 \
        OPENSSL_malloc.3 \
        OpenSSL_add_all_algorithms.3 \
+        PEM_bytes_read_bio.3 \
        PEM_read.3 \
        PEM_read_bio_PrivateKey.3 \
        PEM_write_bio_PKCS7_stream.3 \
diff --git a/src/lib/libcrypto/man/PEM_bytes_read_bio.3 b/src/lib/libcrypto/man/PEM_bytes_read_bio.3
new file mode 100644
index 0000000000..d706a8ad8e
--- /dev/null
+++ b/src/lib/libcrypto/man/PEM_bytes_read_bio.3
@@ -0,0 +1,112 @@
+.\"     $OpenBSD: PEM_bytes_read_bio.3,v 1.1 2017/08/20 20:15:13 schwarze Exp $
+.\"     OpenSSL PEM_bytes_read_bio.pod 7671342e Feb 29 15:47:12 2016 -0600
+.\"
+.\" This file was written by Benjamin Kaduk <bkaduk at akamai dot com>.
+.\" Copyright (c) 2017 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: August 20 2017 $
+.Dt PEM_BYTES_READ_BIO 3
+.Os
+.Sh NAME
+.Nm PEM_bytes_read_bio
+.Nd read a PEM-encoded data structure from a BIO
+.Sh SYNOPSIS
+.In openssl/pem.h
+.Ft int
+.Fo PEM_bytes_read_bio
+.Fa "unsigned char **pdata"
+.Fa "long *plen"
+.Fa "char **pnm"
+.Fa "const char *name"
+.Fa "BIO *bp"
+.Fa "pem_password_cb *cb"
+.Fa "void *u"
+.Fc
+.Sh DESCRIPTION
+.Fn PEM_bytes_read_bio
+reads PEM-formatted (RFC 1421) data from the BIO
+.Fa bp
+for the data type given in
+.Fa name
+(RSA PRIVATE KEY, CERTIFICATE, etc.).
+If multiple PEM-encoded data structures are present in the same stream,
+.Fn PEM_bytes_read_bio
+will skip non-matching data types and continue reading.
+Non-PEM data present in the stream may cause an error.
+.Pp
+The PEM header may indicate that the following data is encrypted; if so,
+the data will be decrypted, waiting on user input to supply a passphrase
+if needed.
+The password callback
+.Fa cb
+and rock
+.Fa u
+are used to obtain the decryption passphrase, if applicable.
+.Pp
+Some data types have compatibility aliases, such as a file containing
+X509 CERTIFICATE matching a request for the deprecated type CERTIFICATE.
+The actual type indicated by the file is returned in
+.Em *pnm
+if
+.Fa pnm
+is
+.Pf non- Dv NULL .
+The caller must free the storage pointed to by
+.Em *pnm .
+.Pp
+The returned data is the DER-encoded form of the requested type, in
+.Em *pdata
+with length
+.Em *plen .
+The caller must free the storage pointed to by
+.Em *pdata .
+.Sh RETURN VALUES
+.Fn PEM_bytes_read_bio
+returns 1 for success or 0 for failure.
+.Sh SEE ALSO
+.Xr PEM_read 3 ,
+.Xr PEM_read_bio_PrivateKey 3
diff --git a/src/lib/libcrypto/man/PEM_read.3 b/src/lib/libcrypto/man/PEM_read.3
index 50bce044ff..6fe41bd7f1 100644
--- a/src/lib/libcrypto/man/PEM_read.3
+++ b/src/lib/libcrypto/man/PEM_read.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PEM_read.3,v 1.2 2016/11/29 07:29:52 jmc Exp $
+.\"     $OpenBSD: PEM_read.3,v 1.3 2017/08/20 20:15:13 schwarze Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Viktor Dukhovni
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 29 2016 $
+.Dd $Mdocdate: August 20 2017 $
 .Dt PEM_READ 3
 .Os
 .Sh NAME
@@ -279,4 +279,6 @@ is likely meaningless if these functions fail.
 .Sh SEE ALSO
 .Xr d2i_PKCS8PrivateKey_bio 3 ,
 .Xr ERR_GET_LIB 3 ,
-.Xr ERR_peek_last_error 3
+.Xr ERR_peek_last_error 3 ,
+.Xr PEM_bytes_read_bio 3 ,
+.Xr PEM_read_bio_PrivateKey 3
diff --git a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
index 5d0852be25..ec8f81c47f 100644
--- a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
+++ b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.7 2016/12/25 22:15:10 schwarze Exp $
+.\"     $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.8 2017/08/20 20:15:13 schwarze Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 25 2016 $
+.Dd $Mdocdate: August 20 2017 $
 .Dt PEM_READ_BIO_PRIVATEKEY 3
 .Os
 .Sh NAME
@@ -1213,7 +1213,9 @@ pass_cb(char *buf, int size, int rwflag, void *u)
 }
 .Ed
 .Sh SEE ALSO
-.Xr BIO_new 3
+.Xr BIO_new 3 ,
+.Xr PEM_bytes_read_bio 3 ,
+.Xr PEM_read 3
 .Sh CAVEATS
 A frequent cause of problems is attempting to use the PEM routines like
 this:
author	schwarze <>	2017-08-20 20:15:13 +0000
committer	schwarze <>	2017-08-20 20:15:13 +0000
commit	9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e (patch)
tree	65e2853b32a662d91ae3e94cc24c9f212651aace
parent	b5ea9bef8120121305f3090c75a027833140f5d6 (diff)
download	openbsd-9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e.tar.gz openbsd-9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e.tar.bz2 openbsd-9870f9e03c46ab5263c4ccabf4e8b39aaed76e4e.zip

diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile index 733e6730ab..66144c8231 100644 --- a/src/lib/libcrypto/man/Makefile +++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
1	# $OpenBSD: Makefile,v 1.122 2017/08/20 19:21:20 schwarze Exp $	1	# $OpenBSD: Makefile,v 1.123 2017/08/20 20:15:13 schwarze Exp $
2		2
3	.include <bsd.own.mk>	3	.include <bsd.own.mk>
4		4
@@ -151,6 +151,7 @@ MAN= \
151	OPENSSL_load_builtin_modules.3 \	151	OPENSSL_load_builtin_modules.3 \
152	OPENSSL_malloc.3 \	152	OPENSSL_malloc.3 \
153	OpenSSL_add_all_algorithms.3 \	153	OpenSSL_add_all_algorithms.3 \
		154	PEM_bytes_read_bio.3 \
154	PEM_read.3 \	155	PEM_read.3 \
155	PEM_read_bio_PrivateKey.3 \	156	PEM_read_bio_PrivateKey.3 \
156	PEM_write_bio_PKCS7_stream.3 \	157	PEM_write_bio_PKCS7_stream.3 \


diff --git a/src/lib/libcrypto/man/PEM_bytes_read_bio.3 b/src/lib/libcrypto/man/PEM_bytes_read_bio.3 new file mode 100644 index 0000000000..d706a8ad8e --- /dev/null +++ b/src/lib/libcrypto/man/PEM_bytes_read_bio.3
@@ -0,0 +1,112 @@
		1	.\" $OpenBSD: PEM_bytes_read_bio.3,v 1.1 2017/08/20 20:15:13 schwarze Exp $
		2	.\" OpenSSL PEM_bytes_read_bio.pod 7671342e Feb 29 15:47:12 2016 -0600
		3	.\"
		4	.\" This file was written by Benjamin Kaduk <bkaduk at akamai dot com>.
		5	.\" Copyright (c) 2017 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: August 20 2017 $
		52	.Dt PEM_BYTES_READ_BIO 3
		53	.Os
		54	.Sh NAME
		55	.Nm PEM_bytes_read_bio
		56	.Nd read a PEM-encoded data structure from a BIO
		57	.Sh SYNOPSIS
		58	.In openssl/pem.h
		59	.Ft int
		60	.Fo PEM_bytes_read_bio
		61	.Fa "unsigned char **pdata"
		62	.Fa "long *plen"
		63	.Fa "char **pnm"
		64	.Fa "const char *name"
		65	.Fa "BIO *bp"
		66	.Fa "pem_password_cb *cb"
		67	.Fa "void *u"
		68	.Fc
		69	.Sh DESCRIPTION
		70	.Fn PEM_bytes_read_bio
		71	reads PEM-formatted (RFC 1421) data from the BIO
		72	.Fa bp
		73	for the data type given in
		74	.Fa name
		75	(RSA PRIVATE KEY, CERTIFICATE, etc.).
		76	If multiple PEM-encoded data structures are present in the same stream,
		77	.Fn PEM_bytes_read_bio
		78	will skip non-matching data types and continue reading.
		79	Non-PEM data present in the stream may cause an error.
		80	.Pp
		81	The PEM header may indicate that the following data is encrypted; if so,
		82	the data will be decrypted, waiting on user input to supply a passphrase
		83	if needed.
		84	The password callback
		85	.Fa cb
		86	and rock
		87	.Fa u
		88	are used to obtain the decryption passphrase, if applicable.
		89	.Pp
		90	Some data types have compatibility aliases, such as a file containing
		91	X509 CERTIFICATE matching a request for the deprecated type CERTIFICATE.
		92	The actual type indicated by the file is returned in
		93	.Em *pnm
		94	if
		95	.Fa pnm
		96	is
		97	.Pf non- Dv NULL .
		98	The caller must free the storage pointed to by
		99	.Em *pnm .
		100	.Pp
		101	The returned data is the DER-encoded form of the requested type, in
		102	.Em *pdata
		103	with length
		104	.Em *plen .
		105	The caller must free the storage pointed to by
		106	.Em *pdata .
		107	.Sh RETURN VALUES
		108	.Fn PEM_bytes_read_bio
		109	returns 1 for success or 0 for failure.
		110	.Sh SEE ALSO
		111	.Xr PEM_read 3 ,
		112	.Xr PEM_read_bio_PrivateKey 3


diff --git a/src/lib/libcrypto/man/PEM_read.3 b/src/lib/libcrypto/man/PEM_read.3 index 50bce044ff..6fe41bd7f1 100644 --- a/src/lib/libcrypto/man/PEM_read.3 +++ b/src/lib/libcrypto/man/PEM_read.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: PEM_read.3,v 1.2 2016/11/29 07:29:52 jmc Exp $	1	.\" $OpenBSD: PEM_read.3,v 1.3 2017/08/20 20:15:13 schwarze Exp $
2	.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400	2	.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
3	.\"	3	.\"
4	.\" This file was written by Viktor Dukhovni	4	.\" This file was written by Viktor Dukhovni
@@ -49,7 +49,7 @@
49	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	49	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	50	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51	.\"	51	.\"
52	.Dd $Mdocdate: November 29 2016 $	52	.Dd $Mdocdate: August 20 2017 $
53	.Dt PEM_READ 3	53	.Dt PEM_READ 3
54	.Os	54	.Os
55	.Sh NAME	55	.Sh NAME
@@ -279,4 +279,6 @@ is likely meaningless if these functions fail.
279	.Sh SEE ALSO	279	.Sh SEE ALSO
280	.Xr d2i_PKCS8PrivateKey_bio 3 ,	280	.Xr d2i_PKCS8PrivateKey_bio 3 ,
281	.Xr ERR_GET_LIB 3 ,	281	.Xr ERR_GET_LIB 3 ,
282	.Xr ERR_peek_last_error 3	282	.Xr ERR_peek_last_error 3 ,
		283	.Xr PEM_bytes_read_bio 3 ,
		284	.Xr PEM_read_bio_PrivateKey 3


diff --git a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 index 5d0852be25..ec8f81c47f 100644 --- a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 +++ b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.7 2016/12/25 22:15:10 schwarze Exp $	1	.\" $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.8 2017/08/20 20:15:13 schwarze Exp $
2	.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400	2	.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
3	.\"	3	.\"
4	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.	4	.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
49	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	49	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	50	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51	.\"	51	.\"
52	.Dd $Mdocdate: December 25 2016 $	52	.Dd $Mdocdate: August 20 2017 $
53	.Dt PEM_READ_BIO_PRIVATEKEY 3	53	.Dt PEM_READ_BIO_PRIVATEKEY 3
54	.Os	54	.Os
55	.Sh NAME	55	.Sh NAME
@@ -1213,7 +1213,9 @@ pass_cb(char buf, int size, int rwflag, void u)
1213	}	1213	}
1214	.Ed	1214	.Ed
1215	.Sh SEE ALSO	1215	.Sh SEE ALSO
1216	.Xr BIO_new 3	1216	.Xr BIO_new 3 ,
		1217	.Xr PEM_bytes_read_bio 3 ,
		1218	.Xr PEM_read 3
1217	.Sh CAVEATS	1219	.Sh CAVEATS
1218	A frequent cause of problems is attempting to use the PEM routines like	1220	A frequent cause of problems is attempting to use the PEM routines like
1219	this:	1221	this: