summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorschwarze <>2018-02-16 17:54:23 +0000
committerschwarze <>2018-02-16 17:54:23 +0000
commit4535a87081737e81062ecab0f6f0c9942a2eb31e (patch)
treecfc330d8e2c66695a88ef332706932456c195eec /src
parent6175606f57c702839620f7be2b0d09144134bdff (diff)
downloadopenbsd-4535a87081737e81062ecab0f6f0c9942a2eb31e.tar.gz
openbsd-4535a87081737e81062ecab0f6f0c9942a2eb31e.tar.bz2
openbsd-4535a87081737e81062ecab0f6f0c9942a2eb31e.zip
Add missing RETURN VALUES sections; from Paul Yang
via OpenSSL commit 1f13ad31 Dec 25 17:50:39 2017 +0800 tweaked by me.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/man/d2i_DHparams.320
-rw-r--r--src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.324
2 files changed, 36 insertions, 8 deletions
diff --git a/src/lib/libcrypto/man/d2i_DHparams.3 b/src/lib/libcrypto/man/d2i_DHparams.3
index b345af68ab..f7cc238899 100644
--- a/src/lib/libcrypto/man/d2i_DHparams.3
+++ b/src/lib/libcrypto/man/d2i_DHparams.3
@@ -1,9 +1,10 @@
1.\" $OpenBSD: d2i_DHparams.3,v 1.5 2016/12/10 22:22:59 schwarze Exp $ 1.\" $OpenBSD: d2i_DHparams.3,v 1.6 2018/02/16 17:54:23 schwarze Exp $
2.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 2.\" full merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
3.\" 3.\"
4.\" This file was written by Ulf Moeller <ulf@openssl.org> and 4.\" This file was written by Ulf Moeller <ulf@openssl.org> and
5.\" Dr. Stephen Henson <steve@openssl.org>. 5.\" Dr. Stephen Henson <steve@openssl.org>.
6.\" Copyright (c) 2000, 2002, 2015 The OpenSSL Project. All rights reserved. 6.\" Copyright (c) 2000, 2002, 2015, 2017 The OpenSSL Project.
7.\" All rights reserved.
7.\" 8.\"
8.\" Redistribution and use in source and binary forms, with or without 9.\" Redistribution and use in source and binary forms, with or without
9.\" modification, are permitted provided that the following conditions 10.\" modification, are permitted provided that the following conditions
@@ -49,7 +50,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 50.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 51.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 52.\"
52.Dd $Mdocdate: December 10 2016 $ 53.Dd $Mdocdate: February 16 2018 $
53.Dt D2I_DHPARAMS 3 54.Dt D2I_DHPARAMS 3
54.Os 55.Os
55.Sh NAME 56.Sh NAME
@@ -76,6 +77,17 @@ They otherwise behave in a way similar to
76.Xr d2i_X509 3 77.Xr d2i_X509 3
77and 78and
78.Xr i2d_X509 3 . 79.Xr i2d_X509 3 .
80.Sh RETURN VALUES
81.Fn d2i_DHparams
82returns a
83.Vt DH
84object or
85.Dv NULL
86if an error occurs.
87.Pp
88.Fn i2d_DHparams
89returns the number of bytes successfully encoded or a value <= 0
90if an error occurs.
79.Sh SEE ALSO 91.Sh SEE ALSO
80.Xr d2i_X509 3 , 92.Xr d2i_X509 3 ,
81.Xr DH_new 3 93.Xr DH_new 3
diff --git a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
index 1fe8503824..8539f86030 100644
--- a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
+++ b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
@@ -1,8 +1,8 @@
1.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.8 2017/01/07 17:27:15 schwarze Exp $ 1.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.9 2018/02/16 17:54:23 schwarze Exp $
2.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 2.\" full merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
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>.
5.\" Copyright (c) 2002, 2016 The OpenSSL Project. All rights reserved. 5.\" Copyright (c) 2002, 2016, 2017 The OpenSSL Project. All rights reserved.
6.\" 6.\"
7.\" Redistribution and use in source and binary forms, with or without 7.\" Redistribution and use in source and binary forms, with or without
8.\" modification, are permitted provided that the following conditions 8.\" modification, are permitted provided that the following conditions
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: January 7 2017 $ 51.Dd $Mdocdate: February 16 2018 $
52.Dt D2I_PKCS8PRIVATEKEY_BIO 3 52.Dt D2I_PKCS8PRIVATEKEY_BIO 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -144,6 +144,22 @@ by converting the buffers to memory BIOs;
144see 144see
145.Xr BIO_s_mem 3 145.Xr BIO_s_mem 3
146for details. 146for details.
147.Sh RETURN VALUES
148.Fn d2i_PKCS8PrivateKey_bio
149and
150.Fn d2i_PKCS8PrivateKey_fp
151return a
152.Vt EVP_PKEY
153object or
154.Dv NULL
155if an error occurs.
156.Pp
157.Fn i2d_PKCS8PrivateKey_bio ,
158.Fn i2d_PKCS8PrivateKey_fp ,
159.Fn i2d_PKCS8PrivateKey_nid_bio ,
160and
161.Fn i2d_PKCS8PrivateKey_nid_fp
162return 1 on success or 0 on error.
147.Sh SEE ALSO 163.Sh SEE ALSO
148.Xr d2i_X509_SIG 3 , 164.Xr d2i_X509_SIG 3 ,
149.Xr PEM_write_PKCS8PrivateKey 3 , 165.Xr PEM_write_PKCS8PrivateKey 3 ,