diff options
author | jmc <> | 2016-11-29 07:29:52 +0000 |
---|---|---|
committer | jmc <> | 2016-11-29 07:29:52 +0000 |
commit | 39dfbc5531ed034e44872ca9f3497f882c480f07 (patch) | |
tree | 23a871051ec7aa783365b666694f1f06d2fa9ace | |
parent | facd14ad39bc3c11f9b333abd87e18b282a27fc4 (diff) | |
download | openbsd-39dfbc5531ed034e44872ca9f3497f882c480f07.tar.gz openbsd-39dfbc5531ed034e44872ca9f3497f882c480f07.tar.bz2 openbsd-39dfbc5531ed034e44872ca9f3497f882c480f07.zip |
minor cleanup;
-rw-r--r-- | src/lib/libcrypto/man/CRYPTO_set_ex_data.3 | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/man/OPENSSL_malloc.3 | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/man/PEM_read.3 | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 index 7cf8f6377c..35d6d5cea3 100644 --- a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 +++ b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.5 2016/11/28 22:25:51 schwarze Exp $ | 1 | .\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.6 2016/11/29 07:29:52 jmc Exp $ |
2 | .\" OpenSSL CRYPTO_get_ex_new_index.pod 35cb565a Nov 19 15:49:30 2015 -0500 | 2 | .\" OpenSSL CRYPTO_get_ex_new_index.pod 35cb565a Nov 19 15:49:30 2015 -0500 |
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>. |
@@ -98,7 +98,7 @@ | |||
98 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 98 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
99 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 99 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
100 | .\" | 100 | .\" |
101 | .Dd $Mdocdate: November 28 2016 $ | 101 | .Dd $Mdocdate: November 29 2016 $ |
102 | .Dt CRYPTO_SET_EX_DATA 3 | 102 | .Dt CRYPTO_SET_EX_DATA 3 |
103 | .Os | 103 | .Os |
104 | .Sh NAME | 104 | .Sh NAME |
@@ -174,7 +174,7 @@ | |||
174 | .Fc | 174 | .Fc |
175 | .Sh DESCRIPTION | 175 | .Sh DESCRIPTION |
176 | Several OpenSSL structures can have application specific data attached | 176 | Several OpenSSL structures can have application specific data attached |
177 | to them, known as "exdata." | 177 | to them, known as "exdata". |
178 | The specific structures are: | 178 | The specific structures are: |
179 | .Bd -literal | 179 | .Bd -literal |
180 | SSL | 180 | SSL |
diff --git a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 index 54eb0a55b8..d03b92bec9 100644 --- a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 +++ b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.3 2016/11/27 15:25:23 schwarze Exp $ | 1 | .\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.4 2016/11/29 07:29:52 jmc Exp $ |
2 | .\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400 | 2 | .\" OpenSSL 9b86974e Aug 17 15:21:33 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: November 27 2016 $ | 51 | .Dd $Mdocdate: November 29 2016 $ |
52 | .Dt EVP_PKEY_SET1_RSA 3 | 52 | .Dt EVP_PKEY_SET1_RSA 3 |
53 | .Os | 53 | .Os |
54 | .Sh NAME | 54 | .Sh NAME |
@@ -207,7 +207,7 @@ will return | |||
207 | .Pp | 207 | .Pp |
208 | Most applications wishing to know a key type will simply call | 208 | Most applications wishing to know a key type will simply call |
209 | .Fn EVP_PKEY_base_id | 209 | .Fn EVP_PKEY_base_id |
210 | and will not care about the actual type: | 210 | and will not care about the actual type, |
211 | which will be identical in almost all cases. | 211 | which will be identical in almost all cases. |
212 | .Pp | 212 | .Pp |
213 | In accordance with the OpenSSL naming convention, the key obtained from | 213 | In accordance with the OpenSSL naming convention, the key obtained from |
diff --git a/src/lib/libcrypto/man/OPENSSL_malloc.3 b/src/lib/libcrypto/man/OPENSSL_malloc.3 index bc76e8367b..71313ce7c8 100644 --- a/src/lib/libcrypto/man/OPENSSL_malloc.3 +++ b/src/lib/libcrypto/man/OPENSSL_malloc.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: OPENSSL_malloc.3,v 1.1 2016/11/28 16:33:48 schwarze Exp $ | 1 | .\" $OpenBSD: OPENSSL_malloc.3,v 1.2 2016/11/29 07:29:52 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> | 3 | .\" Copyright (c) 2016 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: November 28 2016 $ | 17 | .Dd $Mdocdate: November 29 2016 $ |
18 | .Dt OPENSSL_MALLOC 3 | 18 | .Dt OPENSSL_MALLOC 3 |
19 | .Os | 19 | .Os |
20 | .Sh NAME | 20 | .Sh NAME |
@@ -145,7 +145,7 @@ assigns pointers to the C library functions | |||
145 | and | 145 | and |
146 | .Xr free 3 | 146 | .Xr free 3 |
147 | to those of its arguments that are not | 147 | to those of its arguments that are not |
148 | .Dv NULL. | 148 | .Dv NULL . |
149 | .Pp | 149 | .Pp |
150 | .Fn CRYPTO_set_mem_functions , | 150 | .Fn CRYPTO_set_mem_functions , |
151 | .Fn CRYPTO_mem_ctrl , | 151 | .Fn CRYPTO_mem_ctrl , |
diff --git a/src/lib/libcrypto/man/PEM_read.3 b/src/lib/libcrypto/man/PEM_read.3 index bca26f1ef6..50bce044ff 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.1 2016/11/28 17:55:26 schwarze Exp $ | 1 | .\" $OpenBSD: PEM_read.3,v 1.2 2016/11/29 07:29:52 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 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: November 28 2016 $ | 52 | .Dd $Mdocdate: November 29 2016 $ |
53 | .Dt PEM_READ 3 | 53 | .Dt PEM_READ 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -191,7 +191,7 @@ encryption format is obsolete and should be avoided. | |||
191 | It uses an encryption format with an OpenSSL-specific key-derivation | 191 | It uses an encryption format with an OpenSSL-specific key-derivation |
192 | function, which employs MD5 with an iteration count of 1. | 192 | function, which employs MD5 with an iteration count of 1. |
193 | Instead, private keys should be stored in PKCS#8 form, with a strong | 193 | Instead, private keys should be stored in PKCS#8 form, with a strong |
194 | PKCS#5 v2.0 PBE, see | 194 | PKCS#5 v2.0 PBE; see |
195 | .Xr PEM_write_PrivateKey 3 | 195 | .Xr PEM_write_PrivateKey 3 |
196 | and | 196 | and |
197 | .Xr d2i_PKCS8PrivateKey_bio 3 . | 197 | .Xr d2i_PKCS8PrivateKey_bio 3 . |
diff --git a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 index 4779417435..1209b71ce1 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.4 2016/11/28 21:50:44 schwarze Exp $ | 1 | .\" $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.5 2016/11/29 07:29:52 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 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: November 28 2016 $ | 52 | .Dd $Mdocdate: November 29 2016 $ |
53 | .Dt PEM_READ_BIO_PRIVATEKEY 3 | 53 | .Dt PEM_READ_BIO_PRIVATEKEY 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -851,7 +851,7 @@ The | |||
851 | functions process EC parameters using an | 851 | functions process EC parameters using an |
852 | .Vt EC_GROUP | 852 | .Vt EC_GROUP |
853 | structure and the | 853 | structure and the |
854 | .Xr d2i_ECPKParameters | 854 | .Xr d2i_ECPKParameters 3 |
855 | function. | 855 | function. |
856 | .Pp | 856 | .Pp |
857 | The | 857 | The |