In x509_vfy.h rev. 1.22 2018/02/22 17:15:09, jsing@ provided

X509_STORE_up_ref(3). X509_STORE_new(3) and X509_STORE_free(3) have already been available earlier. Import the documentation from OpenSSL, adding some precision.
author: schwarze <> 2018-02-25 17:46:39 +0000
committer: schwarze <> 2018-02-25 17:46:39 +0000
commit: 50c45943c56c5e51b769f1eaaae9b1b47aeb5328 (patch)
tree: c250adca6e80f8b9c2ea059f4786a9f1792397f9
parent: ba5c2cc695ab25981e4c350070be6ff83f0387fc (diff)
download: openbsd-50c45943c56c5e51b769f1eaaae9b1b47aeb5328.tar.gz
openbsd-50c45943c56c5e51b769f1eaaae9b1b47aeb5328.tar.bz2
openbsd-50c45943c56c5e51b769f1eaaae9b1b47aeb5328.zip
8 files changed, 157 insertions, 15 deletions
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index d880928ea5..0de55209bb 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.133 2018/02/19 14:08:52 schwarze Exp $
+# $OpenBSD: Makefile,v 1.134 2018/02/25 17:46:38 schwarze Exp $
 .include <bsd.own.mk>
@@ -231,6 +231,7 @@ MAN=	\
        X509_STORE_CTX_new.3 \
        X509_STORE_CTX_set_verify_cb.3 \
        X509_STORE_load_locations.3 \
+        X509_STORE_new.3 \
        X509_STORE_set_verify_cb_func.3 \
        X509_STORE_set1_param.3 \
        X509_VERIFY_PARAM_set_flags.3 \
diff --git a/src/lib/libcrypto/man/PKCS7_verify.3 b/src/lib/libcrypto/man/PKCS7_verify.3
index f046a0b84b..716282ead3 100644
--- a/src/lib/libcrypto/man/PKCS7_verify.3
+++ b/src/lib/libcrypto/man/PKCS7_verify.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: PKCS7_verify.3,v 1.5 2016/12/13 15:00:22 schwarze Exp $
+.\"     $OpenBSD: PKCS7_verify.3,v 1.6 2018/02/25 17:46:38 schwarze Exp $
 .\"     OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 13 2016 $
+.Dd $Mdocdate: February 25 2018 $
 .Dt PKCS7_VERIFY 3
 .Os
 .Sh NAME
@@ -226,7 +226,8 @@ The error can be obtained from
 .Sh SEE ALSO
 .Xr ERR_get_error 3 ,
 .Xr PKCS7_new 3 ,
-.Xr PKCS7_sign 3
+.Xr PKCS7_sign 3 ,
+.Xr X509_STORE_new 3
 .Sh HISTORY
 .Fn PKCS7_verify
 was added to OpenSSL 0.9.5 .
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_new.3 b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
index c83958b54f..31c7704178 100644
--- a/src/lib/libcrypto/man/X509_STORE_CTX_new.3
+++ b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_STORE_CTX_new.3,v 1.9 2018/02/25 16:26:15 schwarze Exp $
+.\" $OpenBSD: X509_STORE_CTX_new.3,v 1.10 2018/02/25 17:46:38 schwarze Exp $
 .\" full merge up to: OpenSSL 186bb907 Apr 13 11:05:13 2015 -0700
 .\" selective merge up to: OpenSSL 7643a172 Apr 21 13:35:51 2017 +0200
 .\"
@@ -317,6 +317,7 @@ returns 1 for success or 0 if an error occurred.
 returns an internal pointer.
 .Sh SEE ALSO
 .Xr X509_STORE_CTX_get_error 3 ,
+.Xr X509_STORE_new 3 ,
 .Xr X509_verify_cert 3 ,
 .Xr X509_VERIFY_PARAM_set_flags 3
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/X509_STORE_load_locations.3 b/src/lib/libcrypto/man/X509_STORE_load_locations.3
index 8f1f41feac..ca81297bed 100644
--- a/src/lib/libcrypto/man/X509_STORE_load_locations.3
+++ b/src/lib/libcrypto/man/X509_STORE_load_locations.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_STORE_load_locations.3,v 1.2 2017/01/07 08:46:13 jmc Exp $
+.\"     $OpenBSD: X509_STORE_load_locations.3,v 1.3 2018/02/25 17:46:38 schwarze Exp $
 .\"
 .\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 7 2017 $
+.Dd $Mdocdate: February 25 2018 $
 .Dt X509_STORE_LOAD_LOCATIONS 3
 .Os
 .Sh NAME
@@ -105,6 +105,7 @@ default directory for
 .Sh SEE ALSO
 .Xr SSL_CTX_load_verify_locations 3 ,
 .Xr X509_LOOKUP_hash_dir 3 ,
+.Xr X509_STORE_new 3 ,
 .Xr X509_STORE_set1_param 3 ,
 .Xr X509_STORE_set_verify_cb 3
 .Sh BUGS
diff --git a/src/lib/libcrypto/man/X509_STORE_new.3 b/src/lib/libcrypto/man/X509_STORE_new.3
new file mode 100644
index 0000000000..4fc9e95205
--- /dev/null
+++ b/src/lib/libcrypto/man/X509_STORE_new.3
@@ -0,0 +1,133 @@
+.\" $OpenBSD: X509_STORE_new.3,v 1.1 2018/02/25 17:46:38 schwarze Exp $
+.\" full merge up to: OpenSSL 05ea606a May 20 20:52:46 2016 -0400
+.\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
+.\"
+.\" This file is a derived work.
+.\" The changes are covered by the following Copyright and license:
+.\"
+.\" Copyright (c) 2018 Ingo Schwarze <schwarze@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" The original file was written by
+.\" Alessandro Ghedini <alessandro@ghedini.me>.
+.\" Copyright (c) 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: February 25 2018 $
+.Dt X509_STORE_NEW 3
+.Os
+.Sh NAME
+.Nm X509_STORE_new ,
+.Nm X509_STORE_up_ref ,
+.Nm X509_STORE_free
+.Nd allocate and free X.509 certificate stores
+.Sh SYNOPSIS
+.In openssl/x509_vfy.h
+.Ft X509_STORE *
+.Fn X509_STORE_new void
+.Ft int
+.Fo X509_STORE_up_ref
+.Fa "X509_STORE *store"
+.Fc
+.Ft void
+.Fo X509_STORE_free
+.Fa "X509_STORE *store"
+.Fc
+.Sh DESCRIPTION
+.Fn X509_STORE_new
+allocates and initializes an empty X.509 certificate store
+and sets its reference count to 1.
+.Pp
+.Fn X509_STORE_up_ref
+increments the reference count of
+.Fa store
+by 1.
+.Pp
+.Fn X509_STORE_free
+decrements the reference count of
+.Fa store
+by 1.
+If the reference count reaches 0,
+all resources used by the store, including all certificates
+contained in it, are released and
+.Fa store
+itself is freed.
+If
+.Fa store
+is a
+.Dv NULL
+pointer, no action occurs.
+.Sh RETURN VALUES
+.Fn X509_STORE_new
+returns a newly created
+.Vt X509_STORE
+object or
+.Dv NULL
+if an error occurs.
+.Pp
+.Fn X509_STORE_up_ref
+returns 1 for success and 0 for failure.
+.Sh SEE ALSO
+.Xr PKCS7_verify 3 ,
+.Xr SSL_CTX_set_cert_store 3 ,
+.Xr X509_STORE_CTX_new 3 ,
+.Xr X509_STORE_load_locations 3 ,
+.Xr X509_STORE_set1_param 3 ,
+.Xr X509_STORE_set_verify_cb 3
+.Sh HISTORY
+.Fn X509_STORE_up_ref
+first appeared in OpenSSL 1.1.0.
diff --git a/src/lib/libcrypto/man/X509_STORE_set1_param.3 b/src/lib/libcrypto/man/X509_STORE_set1_param.3
index 000058515e..bed64c4c4b 100644
--- a/src/lib/libcrypto/man/X509_STORE_set1_param.3
+++ b/src/lib/libcrypto/man/X509_STORE_set1_param.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_STORE_set1_param.3,v 1.3 2017/01/06 22:46:06 schwarze Exp $
+.\"     $OpenBSD: X509_STORE_set1_param.3,v 1.4 2018/02/25 17:46:39 schwarze Exp $
 .\"     OpenSSL 99d63d46
 .\"
 .\" This file was written by Christian Heimes <cheimes@redhat.com>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 6 2017 $
+.Dd $Mdocdate: February 25 2018 $
 .Dt X509_STORE_SET1_PARAM 3
 .Os
 .Sh NAME
@@ -70,3 +70,6 @@ for
 .Sh RETURN VALUES
 .Fn X509_STORE_set1_param
 returns 1 for success and 0 for failure.
+.Sh SEE ALSO
+.Xr X509_STORE_load_locations 3 ,
+.Xr X509_STORE_new 3
diff --git a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
index 3baccfba77..18691126e6 100644
--- a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
+++ b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_STORE_set_verify_cb_func.3,v 1.4 2016/12/10 20:34:57 schwarze Exp $
+.\"     $OpenBSD: X509_STORE_set_verify_cb_func.3,v 1.5 2018/02/25 17:46:39 schwarze Exp $
 .\"     OpenSSL 05ea606a May 20 20:52:46 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 10 2016 $
+.Dd $Mdocdate: February 25 2018 $
 .Dt X509_STORE_SET_VERIFY_CB_FUNC 3
 .Os
 .Sh NAME
@@ -92,7 +92,8 @@ and
 .Fn X509_STORE_set_verify_cb_func
 do not return a value.
 .Sh SEE ALSO
-.Xr X509_STORE_CTX_set_verify_cb 3
+.Xr X509_STORE_CTX_set_verify_cb 3 ,
+.Xr X509_STORE_new 3
 .Sh HISTORY
 .Fn X509_STORE_set_verify_cb_func
 is available in all versions of SSLeay and OpenSSL.
diff --git a/src/lib/libssl/man/SSL_CTX_set_cert_store.3 b/src/lib/libssl/man/SSL_CTX_set_cert_store.3
index 4fd6fa7714..9fd754c0f6 100644
--- a/src/lib/libssl/man/SSL_CTX_set_cert_store.3
+++ b/src/lib/libssl/man/SSL_CTX_set_cert_store.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: SSL_CTX_set_cert_store.3,v 1.4 2017/04/10 16:11:50 schwarze Exp $
+.\"     $OpenBSD: SSL_CTX_set_cert_store.3,v 1.5 2018/02/25 17:46:39 schwarze Exp $
 .\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 10 2017 $
+.Dd $Mdocdate: February 25 2018 $
 .Dt SSL_CTX_SET_CERT_STORE 3
 .Os
 .Sh NAME
@@ -120,4 +120,5 @@ returns the current setting.
 .Sh SEE ALSO
 .Xr ssl 3 ,
 .Xr SSL_CTX_load_verify_locations 3 ,
-.Xr SSL_CTX_set_verify 3
+.Xr SSL_CTX_set_verify 3 ,
+.Xr X509_STORE_new 3
author	schwarze <>	2018-02-25 17:46:39 +0000
committer	schwarze <>	2018-02-25 17:46:39 +0000
commit	50c45943c56c5e51b769f1eaaae9b1b47aeb5328 (patch)
tree	c250adca6e80f8b9c2ea059f4786a9f1792397f9
parent	ba5c2cc695ab25981e4c350070be6ff83f0387fc (diff)
download	openbsd-50c45943c56c5e51b769f1eaaae9b1b47aeb5328.tar.gz openbsd-50c45943c56c5e51b769f1eaaae9b1b47aeb5328.tar.bz2 openbsd-50c45943c56c5e51b769f1eaaae9b1b47aeb5328.zip

diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile index d880928ea5..0de55209bb 100644 --- a/src/lib/libcrypto/man/Makefile +++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
1	# $OpenBSD: Makefile,v 1.133 2018/02/19 14:08:52 schwarze Exp $	1	# $OpenBSD: Makefile,v 1.134 2018/02/25 17:46:38 schwarze Exp $
2		2
3	.include <bsd.own.mk>	3	.include <bsd.own.mk>
4		4
@@ -231,6 +231,7 @@ MAN= \
231	X509_STORE_CTX_new.3 \	231	X509_STORE_CTX_new.3 \
232	X509_STORE_CTX_set_verify_cb.3 \	232	X509_STORE_CTX_set_verify_cb.3 \
233	X509_STORE_load_locations.3 \	233	X509_STORE_load_locations.3 \
		234	X509_STORE_new.3 \
234	X509_STORE_set_verify_cb_func.3 \	235	X509_STORE_set_verify_cb_func.3 \
235	X509_STORE_set1_param.3 \	236	X509_STORE_set1_param.3 \
236	X509_VERIFY_PARAM_set_flags.3 \	237	X509_VERIFY_PARAM_set_flags.3 \


diff --git a/src/lib/libcrypto/man/PKCS7_verify.3 b/src/lib/libcrypto/man/PKCS7_verify.3 index f046a0b84b..716282ead3 100644 --- a/src/lib/libcrypto/man/PKCS7_verify.3 +++ b/src/lib/libcrypto/man/PKCS7_verify.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: PKCS7_verify.3,v 1.5 2016/12/13 15:00:22 schwarze Exp $	1	.\" $OpenBSD: PKCS7_verify.3,v 1.6 2018/02/25 17:46:38 schwarze Exp $
2	.\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400	2	.\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -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>.
@@ -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: December 13 2016 $	51	.Dd $Mdocdate: February 25 2018 $
52	.Dt PKCS7_VERIFY 3	52	.Dt PKCS7_VERIFY 3
53	.Os	53	.Os
54	.Sh NAME	54	.Sh NAME
@@ -226,7 +226,8 @@ The error can be obtained from
226	.Sh SEE ALSO	226	.Sh SEE ALSO
227	.Xr ERR_get_error 3 ,	227	.Xr ERR_get_error 3 ,
228	.Xr PKCS7_new 3 ,	228	.Xr PKCS7_new 3 ,
229	.Xr PKCS7_sign 3	229	.Xr PKCS7_sign 3 ,
		230	.Xr X509_STORE_new 3
230	.Sh HISTORY	231	.Sh HISTORY
231	.Fn PKCS7_verify	232	.Fn PKCS7_verify
232	was added to OpenSSL 0.9.5 .	233	was added to OpenSSL 0.9.5 .


diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_new.3 b/src/lib/libcrypto/man/X509_STORE_CTX_new.3 index c83958b54f..31c7704178 100644 --- a/src/lib/libcrypto/man/X509_STORE_CTX_new.3 +++ b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: X509_STORE_CTX_new.3,v 1.9 2018/02/25 16:26:15 schwarze Exp $	1	.\" $OpenBSD: X509_STORE_CTX_new.3,v 1.10 2018/02/25 17:46:38 schwarze Exp $
2	.\" full merge up to: OpenSSL 186bb907 Apr 13 11:05:13 2015 -0700	2	.\" full merge up to: OpenSSL 186bb907 Apr 13 11:05:13 2015 -0700
3	.\" selective merge up to: OpenSSL 7643a172 Apr 21 13:35:51 2017 +0200	3	.\" selective merge up to: OpenSSL 7643a172 Apr 21 13:35:51 2017 +0200
4	.\"	4	.\"
@@ -317,6 +317,7 @@ returns 1 for success or 0 if an error occurred.
317	returns an internal pointer.	317	returns an internal pointer.
318	.Sh SEE ALSO	318	.Sh SEE ALSO
319	.Xr X509_STORE_CTX_get_error 3 ,	319	.Xr X509_STORE_CTX_get_error 3 ,
		320	.Xr X509_STORE_new 3 ,
320	.Xr X509_verify_cert 3 ,	321	.Xr X509_verify_cert 3 ,
321	.Xr X509_VERIFY_PARAM_set_flags 3	322	.Xr X509_VERIFY_PARAM_set_flags 3
322	.Sh HISTORY	323	.Sh HISTORY


diff --git a/src/lib/libcrypto/man/X509_STORE_load_locations.3 b/src/lib/libcrypto/man/X509_STORE_load_locations.3 index 8f1f41feac..ca81297bed 100644 --- a/src/lib/libcrypto/man/X509_STORE_load_locations.3 +++ b/src/lib/libcrypto/man/X509_STORE_load_locations.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: X509_STORE_load_locations.3,v 1.2 2017/01/07 08:46:13 jmc Exp $	1	.\" $OpenBSD: X509_STORE_load_locations.3,v 1.3 2018/02/25 17:46:38 schwarze Exp $
2	.\"	2	.\"
3	.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>	3	.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
4	.\"	4	.\"
@@ -14,7 +14,7 @@
14	.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF	14	.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15	.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.	15	.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16	.\"	16	.\"
17	.Dd $Mdocdate: January 7 2017 $	17	.Dd $Mdocdate: February 25 2018 $
18	.Dt X509_STORE_LOAD_LOCATIONS 3	18	.Dt X509_STORE_LOAD_LOCATIONS 3
19	.Os	19	.Os
20	.Sh NAME	20	.Sh NAME
@@ -105,6 +105,7 @@ default directory for
105	.Sh SEE ALSO	105	.Sh SEE ALSO
106	.Xr SSL_CTX_load_verify_locations 3 ,	106	.Xr SSL_CTX_load_verify_locations 3 ,
107	.Xr X509_LOOKUP_hash_dir 3 ,	107	.Xr X509_LOOKUP_hash_dir 3 ,
		108	.Xr X509_STORE_new 3 ,
108	.Xr X509_STORE_set1_param 3 ,	109	.Xr X509_STORE_set1_param 3 ,
109	.Xr X509_STORE_set_verify_cb 3	110	.Xr X509_STORE_set_verify_cb 3
110	.Sh BUGS	111	.Sh BUGS


diff --git a/src/lib/libcrypto/man/X509_STORE_new.3 b/src/lib/libcrypto/man/X509_STORE_new.3 new file mode 100644 index 0000000000..4fc9e95205 --- /dev/null +++ b/src/lib/libcrypto/man/X509_STORE_new.3
@@ -0,0 +1,133 @@
		1	.\" $OpenBSD: X509_STORE_new.3,v 1.1 2018/02/25 17:46:38 schwarze Exp $
		2	.\" full merge up to: OpenSSL 05ea606a May 20 20:52:46 2016 -0400
		3	.\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
		4	.\"
		5	.\" This file is a derived work.
		6	.\" The changes are covered by the following Copyright and license:
		7	.\"
		8	.\" Copyright (c) 2018 Ingo Schwarze <schwarze@openbsd.org>
		9	.\"
		10	.\" Permission to use, copy, modify, and distribute this software for any
		11	.\" purpose with or without fee is hereby granted, provided that the above
		12	.\" copyright notice and this permission notice appear in all copies.
		13	.\"
		14	.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		15	.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		16	.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		17	.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		18	.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		19	.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		20	.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		21	.\"
		22	.\" The original file was written by
		23	.\" Alessandro Ghedini <alessandro@ghedini.me>.
		24	.\" Copyright (c) 2016 The OpenSSL Project. All rights reserved.
		25	.\"
		26	.\" Redistribution and use in source and binary forms, with or without
		27	.\" modification, are permitted provided that the following conditions
		28	.\" are met:
		29	.\"
		30	.\" 1. Redistributions of source code must retain the above copyright
		31	.\" notice, this list of conditions and the following disclaimer.
		32	.\"
		33	.\" 2. Redistributions in binary form must reproduce the above copyright
		34	.\" notice, this list of conditions and the following disclaimer in
		35	.\" the documentation and/or other materials provided with the
		36	.\" distribution.
		37	.\"
		38	.\" 3. All advertising materials mentioning features or use of this
		39	.\" software must display the following acknowledgment:
		40	.\" "This product includes software developed by the OpenSSL Project
		41	.\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
		42	.\"
		43	.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
		44	.\" endorse or promote products derived from this software without
		45	.\" prior written permission. For written permission, please contact
		46	.\" openssl-core@openssl.org.
		47	.\"
		48	.\" 5. Products derived from this software may not be called "OpenSSL"
		49	.\" nor may "OpenSSL" appear in their names without prior written
		50	.\" permission of the OpenSSL Project.
		51	.\"
		52	.\" 6. Redistributions of any form whatsoever must retain the following
		53	.\" acknowledgment:
		54	.\" "This product includes software developed by the OpenSSL Project
		55	.\" for use in the OpenSSL Toolkit (http://www.openssl.org/)"
		56	.\"
		57	.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
		58	.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		59	.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		60	.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
		61	.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		62	.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
		63	.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		64	.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		65	.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
		66	.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		67	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
		68	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
		69	.\"
		70	.Dd $Mdocdate: February 25 2018 $
		71	.Dt X509_STORE_NEW 3
		72	.Os
		73	.Sh NAME
		74	.Nm X509_STORE_new ,
		75	.Nm X509_STORE_up_ref ,
		76	.Nm X509_STORE_free
		77	.Nd allocate and free X.509 certificate stores
		78	.Sh SYNOPSIS
		79	.In openssl/x509_vfy.h
		80	.Ft X509_STORE *
		81	.Fn X509_STORE_new void
		82	.Ft int
		83	.Fo X509_STORE_up_ref
		84	.Fa "X509_STORE *store"
		85	.Fc
		86	.Ft void
		87	.Fo X509_STORE_free
		88	.Fa "X509_STORE *store"
		89	.Fc
		90	.Sh DESCRIPTION
		91	.Fn X509_STORE_new
		92	allocates and initializes an empty X.509 certificate store
		93	and sets its reference count to 1.
		94	.Pp
		95	.Fn X509_STORE_up_ref
		96	increments the reference count of
		97	.Fa store
		98	by 1.
		99	.Pp
		100	.Fn X509_STORE_free
		101	decrements the reference count of
		102	.Fa store
		103	by 1.
		104	If the reference count reaches 0,
		105	all resources used by the store, including all certificates
		106	contained in it, are released and
		107	.Fa store
		108	itself is freed.
		109	If
		110	.Fa store
		111	is a
		112	.Dv NULL
		113	pointer, no action occurs.
		114	.Sh RETURN VALUES
		115	.Fn X509_STORE_new
		116	returns a newly created
		117	.Vt X509_STORE
		118	object or
		119	.Dv NULL
		120	if an error occurs.
		121	.Pp
		122	.Fn X509_STORE_up_ref
		123	returns 1 for success and 0 for failure.
		124	.Sh SEE ALSO
		125	.Xr PKCS7_verify 3 ,
		126	.Xr SSL_CTX_set_cert_store 3 ,
		127	.Xr X509_STORE_CTX_new 3 ,
		128	.Xr X509_STORE_load_locations 3 ,
		129	.Xr X509_STORE_set1_param 3 ,
		130	.Xr X509_STORE_set_verify_cb 3
		131	.Sh HISTORY
		132	.Fn X509_STORE_up_ref
		133	first appeared in OpenSSL 1.1.0.


diff --git a/src/lib/libcrypto/man/X509_STORE_set1_param.3 b/src/lib/libcrypto/man/X509_STORE_set1_param.3 index 000058515e..bed64c4c4b 100644 --- a/src/lib/libcrypto/man/X509_STORE_set1_param.3 +++ b/src/lib/libcrypto/man/X509_STORE_set1_param.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: X509_STORE_set1_param.3,v 1.3 2017/01/06 22:46:06 schwarze Exp $	1	.\" $OpenBSD: X509_STORE_set1_param.3,v 1.4 2018/02/25 17:46:39 schwarze Exp $
2	.\" OpenSSL 99d63d46	2	.\" OpenSSL 99d63d46
3	.\"	3	.\"
4	.\" This file was written by Christian Heimes <cheimes@redhat.com>.	4	.\" This file was written by Christian Heimes <cheimes@redhat.com>.
@@ -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 6 2017 $	51	.Dd $Mdocdate: February 25 2018 $
52	.Dt X509_STORE_SET1_PARAM 3	52	.Dt X509_STORE_SET1_PARAM 3
53	.Os	53	.Os
54	.Sh NAME	54	.Sh NAME
@@ -70,3 +70,6 @@ for
70	.Sh RETURN VALUES	70	.Sh RETURN VALUES
71	.Fn X509_STORE_set1_param	71	.Fn X509_STORE_set1_param
72	returns 1 for success and 0 for failure.	72	returns 1 for success and 0 for failure.
		73	.Sh SEE ALSO
		74	.Xr X509_STORE_load_locations 3 ,
		75	.Xr X509_STORE_new 3


diff --git a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 index 3baccfba77..18691126e6 100644 --- a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 +++ b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: X509_STORE_set_verify_cb_func.3,v 1.4 2016/12/10 20:34:57 schwarze Exp $	1	.\" $OpenBSD: X509_STORE_set_verify_cb_func.3,v 1.5 2018/02/25 17:46:39 schwarze Exp $
2	.\" OpenSSL 05ea606a May 20 20:52:46 2016 -0400	2	.\" OpenSSL 05ea606a May 20 20:52:46 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>.
@@ -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: December 10 2016 $	51	.Dd $Mdocdate: February 25 2018 $
52	.Dt X509_STORE_SET_VERIFY_CB_FUNC 3	52	.Dt X509_STORE_SET_VERIFY_CB_FUNC 3
53	.Os	53	.Os
54	.Sh NAME	54	.Sh NAME
@@ -92,7 +92,8 @@ and
92	.Fn X509_STORE_set_verify_cb_func	92	.Fn X509_STORE_set_verify_cb_func
93	do not return a value.	93	do not return a value.
94	.Sh SEE ALSO	94	.Sh SEE ALSO
95	.Xr X509_STORE_CTX_set_verify_cb 3	95	.Xr X509_STORE_CTX_set_verify_cb 3 ,
		96	.Xr X509_STORE_new 3
96	.Sh HISTORY	97	.Sh HISTORY
97	.Fn X509_STORE_set_verify_cb_func	98	.Fn X509_STORE_set_verify_cb_func
98	is available in all versions of SSLeay and OpenSSL.	99	is available in all versions of SSLeay and OpenSSL.


diff --git a/src/lib/libssl/man/SSL_CTX_set_cert_store.3 b/src/lib/libssl/man/SSL_CTX_set_cert_store.3 index 4fd6fa7714..9fd754c0f6 100644 --- a/src/lib/libssl/man/SSL_CTX_set_cert_store.3 +++ b/src/lib/libssl/man/SSL_CTX_set_cert_store.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: SSL_CTX_set_cert_store.3,v 1.4 2017/04/10 16:11:50 schwarze Exp $	1	.\" $OpenBSD: SSL_CTX_set_cert_store.3,v 1.5 2018/02/25 17:46:39 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 Lutz Jaenicke <jaenicke@openssl.org>.	4	.\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -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: April 10 2017 $	51	.Dd $Mdocdate: February 25 2018 $
52	.Dt SSL_CTX_SET_CERT_STORE 3	52	.Dt SSL_CTX_SET_CERT_STORE 3
53	.Os	53	.Os
54	.Sh NAME	54	.Sh NAME
@@ -120,4 +120,5 @@ returns the current setting.
120	.Sh SEE ALSO	120	.Sh SEE ALSO
121	.Xr ssl 3 ,	121	.Xr ssl 3 ,
122	.Xr SSL_CTX_load_verify_locations 3 ,	122	.Xr SSL_CTX_load_verify_locations 3 ,
123	.Xr SSL_CTX_set_verify 3	123	.Xr SSL_CTX_set_verify 3 ,
		124	.Xr X509_STORE_new 3