diff options
-rw-r--r-- | src/lib/libcrypto/man/OCSP_sendreq_new.3 | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/man/OPENSSL_config.3 | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/man/openssl.cnf.5 | 39 |
3 files changed, 8 insertions, 43 deletions
diff --git a/src/lib/libcrypto/man/OCSP_sendreq_new.3 b/src/lib/libcrypto/man/OCSP_sendreq_new.3 index fb3fc4497c..5900ac046b 100644 --- a/src/lib/libcrypto/man/OCSP_sendreq_new.3 +++ b/src/lib/libcrypto/man/OCSP_sendreq_new.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: OCSP_sendreq_new.3,v 1.3 2016/12/06 14:54:55 schwarze Exp $ | 1 | .\" $OpenBSD: OCSP_sendreq_new.3,v 1.4 2017/07/06 15:42:04 schwarze Exp $ |
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 |
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 6 2016 $ | 51 | .Dd $Mdocdate: July 6 2017 $ |
52 | .Dt OCSP_SENDREQ_NEW 3 | 52 | .Dt OCSP_SENDREQ_NEW 3 |
53 | .Os | 53 | .Os |
54 | .Sh NAME | 54 | .Sh NAME |
@@ -140,7 +140,7 @@ If | |||
140 | indicates an operation should be retried, the corresponding BIO can | 140 | indicates an operation should be retried, the corresponding BIO can |
141 | be examined to determine which operation (read or write) should be | 141 | be examined to determine which operation (read or write) should be |
142 | retried and appropriate action can be taken, for example a | 142 | retried and appropriate action can be taken, for example a |
143 | .Xr select 3 | 143 | .Xr select 2 |
144 | call on the underlying socket. | 144 | call on the underlying socket. |
145 | .Pp | 145 | .Pp |
146 | .Fn OCSP_REQ_CTX_free | 146 | .Fn OCSP_REQ_CTX_free |
diff --git a/src/lib/libcrypto/man/OPENSSL_config.3 b/src/lib/libcrypto/man/OPENSSL_config.3 index bf42b72fd2..a5fd5a8d36 100644 --- a/src/lib/libcrypto/man/OPENSSL_config.3 +++ b/src/lib/libcrypto/man/OPENSSL_config.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: OPENSSL_config.3,v 1.5 2016/12/11 18:06:09 schwarze Exp $ | 1 | .\" $OpenBSD: OPENSSL_config.3,v 1.6 2017/07/06 15:42:04 schwarze Exp $ |
2 | .\" OpenSSL ab6577a4 May 14 21:07:51 2014 +0100 | 2 | .\" OpenSSL ab6577a4 May 14 21:07:51 2014 +0100 |
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 11 2016 $ | 51 | .Dd $Mdocdate: July 6 2017 $ |
52 | .Dt OPENSSL_CONFIG 3 | 52 | .Dt OPENSSL_CONFIG 3 |
53 | .Os | 53 | .Os |
54 | .Sh NAME | 54 | .Sh NAME |
@@ -103,7 +103,7 @@ automatically. | |||
103 | It is also possible to automatically call | 103 | It is also possible to automatically call |
104 | .Fn OPENSSL_config | 104 | .Fn OPENSSL_config |
105 | when an application calls | 105 | when an application calls |
106 | .Xr OPENSSL_add_all_algorithms 3 | 106 | .Xr OpenSSL_add_all_algorithms 3 |
107 | by compiling an application with the preprocessor symbol | 107 | by compiling an application with the preprocessor symbol |
108 | .Dv OPENSSL_LOAD_CONF | 108 | .Dv OPENSSL_LOAD_CONF |
109 | #define'd. | 109 | #define'd. |
diff --git a/src/lib/libcrypto/man/openssl.cnf.5 b/src/lib/libcrypto/man/openssl.cnf.5 index 1d8ee2d430..de21a5d973 100644 --- a/src/lib/libcrypto/man/openssl.cnf.5 +++ b/src/lib/libcrypto/man/openssl.cnf.5 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: openssl.cnf.5,v 1.2 2016/12/12 22:02:55 jmc Exp $ | 1 | .\" $OpenBSD: openssl.cnf.5,v 1.3 2017/07/06 15:42:04 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 12 2016 $ | 52 | .Dd $Mdocdate: July 6 2017 $ |
53 | .Dt OPENSSL.CNF 5 | 53 | .Dt OPENSSL.CNF 5 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -322,41 +322,6 @@ other_ctrl = EMPTY | |||
322 | # Supply all default algorithms | 322 | # Supply all default algorithms |
323 | default_algorithms = ALL | 323 | default_algorithms = ALL |
324 | .Ed | 324 | .Ed |
325 | .Ss SSL Configuration Module | ||
326 | This module has the name | ||
327 | .Ic ssl_conf | ||
328 | which points to a section containing SSL configurations. | ||
329 | .Pp | ||
330 | Each line in the SSL configuration section contains the name of the | ||
331 | configuration and the section containing it. | ||
332 | .Pp | ||
333 | Each configuration section consists of command value pairs for | ||
334 | .Vt SSL_CONF . | ||
335 | Each pair will be passed to a | ||
336 | .Vt SSL_CTX | ||
337 | or | ||
338 | .Vt SSL | ||
339 | structure if it calls | ||
340 | .Xr SSL_CTX_config 3 | ||
341 | or | ||
342 | .Xr SSL_config 3 | ||
343 | with the appropriate configuration name. | ||
344 | .Pp | ||
345 | Note: any characters before an initial dot in the configuration section | ||
346 | are ignored so the same command can be used multiple times. | ||
347 | .Pp | ||
348 | For example: | ||
349 | .Bd -literal -offset indent | ||
350 | ssl_conf = ssl_sect | ||
351 | |||
352 | [ssl_sect] | ||
353 | server = server_section | ||
354 | |||
355 | [server_section] | ||
356 | RSA.Certificate = server-rsa.pem | ||
357 | ECDSA.Certificate = server-ecdsa.pem | ||
358 | Ciphers = ALL:!RC4 | ||
359 | .Ed | ||
360 | .Sh FILES | 325 | .Sh FILES |
361 | .Bl -tag -width /etc/ssl/openssl.cnf -compact | 326 | .Bl -tag -width /etc/ssl/openssl.cnf -compact |
362 | .It Pa /etc/ssl/openssl.cnf | 327 | .It Pa /etc/ssl/openssl.cnf |