diff options
author | jmc <> | 2019-05-20 06:04:45 +0000 |
---|---|---|
committer | jmc <> | 2019-05-20 06:04:45 +0000 |
commit | bd6402e761e94bd2f6d6d0f27d031273c92a161f (patch) | |
tree | b1b66c1f183c0c7c635483ba5122b1473635cefb /src | |
parent | 61695072b90b781c0a072c4945281b9efaa40952 (diff) | |
download | openbsd-bd6402e761e94bd2f6d6d0f27d031273c92a161f.tar.gz openbsd-bd6402e761e94bd2f6d6d0f27d031273c92a161f.tar.bz2 openbsd-bd6402e761e94bd2f6d6d0f27d031273c92a161f.zip |
*an* RSA;
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/man/RSA_set_method.3 | 6 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_set_cipher_list.3 | 6 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_use_certificate.3 | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/man/RSA_set_method.3 b/src/lib/libcrypto/man/RSA_set_method.3 index b4724e3e6d..524430b6f8 100644 --- a/src/lib/libcrypto/man/RSA_set_method.3 +++ b/src/lib/libcrypto/man/RSA_set_method.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: RSA_set_method.3,v 1.12 2018/04/18 01:07:38 schwarze Exp $ | 1 | .\" $OpenBSD: RSA_set_method.3,v 1.13 2019/05/20 06:04:45 jmc 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 Ulf Moeller <ulf@openssl.org> | 4 | .\" This file was written by Ulf Moeller <ulf@openssl.org> |
@@ -50,7 +50,7 @@ | |||
50 | .\" 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 |
51 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 51 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
52 | .\" | 52 | .\" |
53 | .Dd $Mdocdate: April 18 2018 $ | 53 | .Dd $Mdocdate: May 20 2019 $ |
54 | .Dt RSA_SET_METHOD 3 | 54 | .Dt RSA_SET_METHOD 3 |
55 | .Os | 55 | .Os |
56 | .Sh NAME | 56 | .Sh NAME |
@@ -308,5 +308,5 @@ but will not be reflected in the return value of the | |||
308 | .Fn RSA_flags | 308 | .Fn RSA_flags |
309 | function - in effect | 309 | function - in effect |
310 | .Fn RSA_flags | 310 | .Fn RSA_flags |
311 | behaves more like a RSA_default_flags() function, which does not | 311 | behaves more like an RSA_default_flags() function, which does not |
312 | currently exist. | 312 | currently exist. |
diff --git a/src/lib/libssl/man/SSL_CTX_set_cipher_list.3 b/src/lib/libssl/man/SSL_CTX_set_cipher_list.3 index a64826e578..64da0092d3 100644 --- a/src/lib/libssl/man/SSL_CTX_set_cipher_list.3 +++ b/src/lib/libssl/man/SSL_CTX_set_cipher_list.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_set_cipher_list.3,v 1.7 2018/04/10 21:37:20 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_CTX_set_cipher_list.3,v 1.8 2019/05/20 06:04:45 jmc Exp $ |
2 | .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 |
3 | .\" | 3 | .\" |
4 | .\" This file is a derived work. | 4 | .\" This file is a derived work. |
@@ -65,7 +65,7 @@ | |||
65 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 65 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
66 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 66 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
67 | .\" | 67 | .\" |
68 | .Dd $Mdocdate: April 10 2018 $ | 68 | .Dd $Mdocdate: May 20 2019 $ |
69 | .Dt SSL_CTX_SET_CIPHER_LIST 3 | 69 | .Dt SSL_CTX_SET_CIPHER_LIST 3 |
70 | .Os | 70 | .Os |
71 | .Sh NAME | 71 | .Sh NAME |
@@ -338,7 +338,7 @@ On the server side, all cipher suites have additional requirements. | |||
338 | ADH ciphers don't need a certificate, but DH-parameters must have been set. | 338 | ADH ciphers don't need a certificate, but DH-parameters must have been set. |
339 | All other cipher suites need a corresponding certificate and key. | 339 | All other cipher suites need a corresponding certificate and key. |
340 | .Pp | 340 | .Pp |
341 | A RSA cipher can only be chosen when a RSA certificate is available. | 341 | A RSA cipher can only be chosen when an RSA certificate is available. |
342 | RSA ciphers using DHE need a certificate and key and additional DH-parameters | 342 | RSA ciphers using DHE need a certificate and key and additional DH-parameters |
343 | (see | 343 | (see |
344 | .Xr SSL_CTX_set_tmp_dh_callback 3 ) . | 344 | .Xr SSL_CTX_set_tmp_dh_callback 3 ) . |
diff --git a/src/lib/libssl/man/SSL_CTX_use_certificate.3 b/src/lib/libssl/man/SSL_CTX_use_certificate.3 index 9959330283..17b7ef54e9 100644 --- a/src/lib/libssl/man/SSL_CTX_use_certificate.3 +++ b/src/lib/libssl/man/SSL_CTX_use_certificate.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_use_certificate.3,v 1.11 2019/04/09 22:01:50 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_CTX_use_certificate.3,v 1.12 2019/05/20 06:04:45 jmc Exp $ |
2 | .\" full merge up to: OpenSSL 3aaa1bd0 Mar 28 16:35:25 2017 +1000 | 2 | .\" full merge up to: OpenSSL 3aaa1bd0 Mar 28 16:35:25 2017 +1000 |
3 | .\" selective merge up to: OpenSSL d1f7a1e6 Apr 26 14:05:40 2018 +0100 | 3 | .\" selective merge up to: OpenSSL d1f7a1e6 Apr 26 14:05:40 2018 +0100 |
4 | .\" | 4 | .\" |
@@ -50,7 +50,7 @@ | |||
50 | .\" 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 |
51 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 51 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
52 | .\" | 52 | .\" |
53 | .Dd $Mdocdate: April 9 2019 $ | 53 | .Dd $Mdocdate: May 20 2019 $ |
54 | .Dt SSL_CTX_USE_CERTIFICATE 3 | 54 | .Dt SSL_CTX_USE_CERTIFICATE 3 |
55 | .Os | 55 | .Os |
56 | .Sh NAME | 56 | .Sh NAME |
@@ -312,7 +312,7 @@ corresponding certificate loaded into | |||
312 | .Fa ctx . | 312 | .Fa ctx . |
313 | If more than one key/certificate pair (RSA/DSA) is installed, | 313 | If more than one key/certificate pair (RSA/DSA) is installed, |
314 | the last item installed will be compared. | 314 | the last item installed will be compared. |
315 | If, e.g., the last item was a RSA certificate or key, | 315 | If, e.g., the last item was an RSA certificate or key, |
316 | the RSA key/certificate pair will be checked. | 316 | the RSA key/certificate pair will be checked. |
317 | .Fn SSL_check_private_key | 317 | .Fn SSL_check_private_key |
318 | performs the same | 318 | performs the same |