summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorschwarze <>2018-03-21 00:37:32 +0000
committerschwarze <>2018-03-21 00:37:32 +0000
commitbe579a1878011343756e60e3a4b8e9a90ec438b7 (patch)
tree7da86c980f1115f0c26d81b2bc65f67f9b455135 /src
parentbc0e901522a5e5aeca7cd5da6e41cfe3ebcdacf1 (diff)
downloadopenbsd-be579a1878011343756e60e3a4b8e9a90ec438b7.tar.gz
openbsd-be579a1878011343756e60e3a4b8e9a90ec438b7.tar.bz2
openbsd-be579a1878011343756e60e3a4b8e9a90ec438b7.zip
pem.h HISTORY up to SSLeay 0.8.1b; researched from OpenSSL git
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/man/PEM_read.38
-rw-r--r--src/lib/libcrypto/man/PEM_read_bio_PrivateKey.348
2 files changed, 52 insertions, 4 deletions
diff --git a/src/lib/libcrypto/man/PEM_read.3 b/src/lib/libcrypto/man/PEM_read.3
index 6fe41bd7f1..f234bc6588 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.3 2017/08/20 20:15:13 schwarze Exp $ 1.\" $OpenBSD: PEM_read.3,v 1.4 2018/03/21 00:37:32 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: August 20 2017 $ 52.Dd $Mdocdate: March 21 2018 $
53.Dt PEM_READ 3 53.Dt PEM_READ 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -282,3 +282,7 @@ is likely meaningless if these functions fail.
282.Xr ERR_peek_last_error 3 , 282.Xr ERR_peek_last_error 3 ,
283.Xr PEM_bytes_read_bio 3 , 283.Xr PEM_bytes_read_bio 3 ,
284.Xr PEM_read_bio_PrivateKey 3 284.Xr PEM_read_bio_PrivateKey 3
285.Sh HISTORY
286These functions appeared in SSLeay 0.8.1b or earlier
287and have been available since
288.Ox 2.4 .
diff --git a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
index ec8f81c47f..d9434e2fc3 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.8 2017/08/20 20:15:13 schwarze Exp $ 1.\" $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.9 2018/03/21 00:37:32 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: August 20 2017 $ 52.Dd $Mdocdate: March 21 2018 $
53.Dt PEM_READ_BIO_PRIVATEKEY 3 53.Dt PEM_READ_BIO_PRIVATEKEY 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -1216,6 +1216,50 @@ pass_cb(char *buf, int size, int rwflag, void *u)
1216.Xr BIO_new 3 , 1216.Xr BIO_new 3 ,
1217.Xr PEM_bytes_read_bio 3 , 1217.Xr PEM_bytes_read_bio 3 ,
1218.Xr PEM_read 3 1218.Xr PEM_read 3
1219.Sh HISTORY
1220.Fn PEM_read_bio_PrivateKey ,
1221.Fn PEM_read_PrivateKey ,
1222.Fn PEM_write_bio_PrivateKey ,
1223.Fn PEM_write_PrivateKey ,
1224.Fn PEM_read_bio_RSAPrivateKey ,
1225.Fn PEM_read_RSAPrivateKey ,
1226.Fn PEM_write_bio_RSAPrivateKey ,
1227.Fn PEM_write_RSAPrivateKey ,
1228.Fn PEM_read_bio_RSAPublicKey ,
1229.Fn PEM_read_RSAPublicKey ,
1230.Fn PEM_write_bio_RSAPublicKey ,
1231.Fn PEM_write_RSAPublicKey ,
1232.Fn PEM_read_bio_DSAPrivateKey ,
1233.Fn PEM_read_DSAPrivateKey ,
1234.Fn PEM_write_bio_DSAPrivateKey ,
1235.Fn PEM_write_DSAPrivateKey ,
1236.Fn PEM_read_bio_DSAparams ,
1237.Fn PEM_read_DSAparams ,
1238.Fn PEM_write_bio_DSAparams ,
1239.Fn PEM_write_DSAparams ,
1240.Fn PEM_read_bio_DHparams ,
1241.Fn PEM_read_DHparams ,
1242.Fn PEM_write_bio_DHparams ,
1243.Fn PEM_write_DHparams ,
1244.Fn PEM_read_bio_X509 ,
1245.Fn PEM_read_X509 ,
1246.Fn PEM_write_bio_X509 ,
1247.Fn PEM_write_X509 ,
1248.Fn PEM_read_bio_X509_REQ ,
1249.Fn PEM_read_X509_REQ ,
1250.Fn PEM_write_bio_X509_REQ ,
1251.Fn PEM_write_X509_REQ ,
1252.Fn PEM_read_bio_X509_CRL ,
1253.Fn PEM_read_X509_CRL ,
1254.Fn PEM_write_bio_X509_CRL ,
1255.Fn PEM_write_X509_CRL ,
1256.Fn PEM_read_bio_PKCS7 ,
1257.Fn PEM_read_PKCS7 ,
1258.Fn PEM_write_bio_PKCS7 ,
1259and
1260.Fn PEM_write_PKCS7
1261appeared in SSLeay 0.8.1b or earlier and have been available since
1262.Ox 2.4 .
1219.Sh CAVEATS 1263.Sh CAVEATS
1220A frequent cause of problems is attempting to use the PEM routines like 1264A frequent cause of problems is attempting to use the PEM routines like
1221this: 1265this: