summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc <>2016-11-29 21:29:19 +0000
committerjmc <>2016-11-29 21:29:19 +0000
commit60f1a54409e7682c49f9538405e9f43abb317363 (patch)
tree67df1a4b6d872bb5e5763fcf13fbd08226f802f5
parent9af7f1423667b1317a78965fbc306c42677c2345 (diff)
downloadopenbsd-60f1a54409e7682c49f9538405e9f43abb317363.tar.gz
openbsd-60f1a54409e7682c49f9538405e9f43abb317363.tar.bz2
openbsd-60f1a54409e7682c49f9538405e9f43abb317363.zip
tweak previous;
-rw-r--r--src/lib/libcrypto/man/CRYPTO_get_mem_functions.37
-rw-r--r--src/lib/libcrypto/man/OPENSSL_cleanse.311
-rw-r--r--src/lib/libcrypto/man/OPENSSL_malloc.38
3 files changed, 12 insertions, 14 deletions
diff --git a/src/lib/libcrypto/man/CRYPTO_get_mem_functions.3 b/src/lib/libcrypto/man/CRYPTO_get_mem_functions.3
index a0bfb8a1d5..0a1ca384a8 100644
--- a/src/lib/libcrypto/man/CRYPTO_get_mem_functions.3
+++ b/src/lib/libcrypto/man/CRYPTO_get_mem_functions.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: CRYPTO_get_mem_functions.3,v 1.1 2016/11/29 18:16:09 deraadt Exp $ 1.\" $OpenBSD: CRYPTO_get_mem_functions.3,v 1.2 2016/11/29 21:29:19 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -15,7 +15,7 @@
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 29 2016 $ 17.Dd $Mdocdate: November 29 2016 $
18.Dt CRYPTO_get_mem_functions 3 18.Dt CRYPTO_GET_MEM_FUNCTIONS 3
19.Os 19.Os
20.Sh NAME 20.Sh NAME
21.Nm CRYPTO_get_mem_functions , 21.Nm CRYPTO_get_mem_functions ,
@@ -61,7 +61,7 @@ assigns pointers to the C library functions
61and 61and
62.Xr free 3 62.Xr free 3
63to those of its arguments that are not 63to those of its arguments that are not
64.Dv NULL. 64.Dv NULL .
65.Pp 65.Pp
66.Fn CRYPTO_set_mem_functions , 66.Fn CRYPTO_set_mem_functions ,
67.Fn CRYPTO_mem_ctrl , 67.Fn CRYPTO_mem_ctrl ,
@@ -70,7 +70,6 @@ and
70.Fn CRYPTO_mem_leaks_fp 70.Fn CRYPTO_mem_leaks_fp
71have no effect. 71have no effect.
72.Sh RETURN VALUES 72.Sh RETURN VALUES
73.Pp
74.Fn CRYPTO_set_mem_functions 73.Fn CRYPTO_set_mem_functions
75always returns 0. 74always returns 0.
76.Pp 75.Pp
diff --git a/src/lib/libcrypto/man/OPENSSL_cleanse.3 b/src/lib/libcrypto/man/OPENSSL_cleanse.3
index b8fc7acad9..ec84e83b3e 100644
--- a/src/lib/libcrypto/man/OPENSSL_cleanse.3
+++ b/src/lib/libcrypto/man/OPENSSL_cleanse.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: OPENSSL_cleanse.3,v 1.1 2016/11/29 18:16:09 deraadt Exp $ 1.\" $OpenBSD: OPENSSL_cleanse.3,v 1.2 2016/11/29 21:29:19 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -15,23 +15,22 @@
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 29 2016 $ 17.Dd $Mdocdate: November 29 2016 $
18.Dt OPENSSL_cleanse 3 18.Dt OPENSSL_CLEANSE 3
19.Os 19.Os
20.Sh NAME 20.Sh NAME
21.Nm OPENSSL_cleanse 21.Nm OPENSSL_cleanse
22.Nd OpenSSL memory cleaning operation 22.Nd OpenSSL memory cleaning operation
23.Sh SYNOPSIS 23.Sh SYNOPSIS
24.In openssl/crypto.h 24.In openssl/crypto.h
25.Fc
26.Ft void 25.Ft void
27.Fo OPENSSL_cleanse 26.Fo OPENSSL_cleanse
28.Fa "void *ptr" 27.Fa "void *ptr"
29.Fa "size_t len" 28.Fa "size_t len"
30.Fc 29.Fc
31.Sh DESCRIPTION 30.Sh DESCRIPTION
32Do not use any of the interfaces documented here. 31Do not use the interface documented here.
33They are provided purely for compatibility with legacy application code. 32It is provided purely for compatibility with legacy application code.
34.Pp 33.Pp
35.Fn OPENSSL_cleanse 34.Fn OPENSSL_cleanse
36has the same semantics as and is a wrapper around 35has the same semantics as, and is a wrapper around,
37.Xr explicit_bzero 3 . 36.Xr explicit_bzero 3 .
diff --git a/src/lib/libcrypto/man/OPENSSL_malloc.3 b/src/lib/libcrypto/man/OPENSSL_malloc.3
index 0b762f66b6..5b841f1aac 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.3 2016/11/29 18:16:09 deraadt Exp $ 1.\" $OpenBSD: OPENSSL_malloc.3,v 1.4 2016/11/29 21:29:19 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -25,7 +25,7 @@
25.Nm CRYPTO_malloc , 25.Nm CRYPTO_malloc ,
26.Nm CRYPTO_realloc , 26.Nm CRYPTO_realloc ,
27.Nm CRYPTO_free , 27.Nm CRYPTO_free ,
28.Nm CRYPTO_strdup , 28.Nm CRYPTO_strdup
29.Nd legacy OpenSSL memory allocation wrappers 29.Nd legacy OpenSSL memory allocation wrappers
30.Sh SYNOPSIS 30.Sh SYNOPSIS
31.In openssl/crypto.h 31.In openssl/crypto.h
@@ -81,8 +81,8 @@ standard
81.Xr realloc 3 , 81.Xr realloc 3 ,
82.Xr free 3 , 82.Xr free 3 ,
83and 83and
84.Xr strdup 3 84.Xr strdup 3
85functions. 85functions.
86.Sh RETURN VALUES 86.Sh RETURN VALUES
87These functions return same type and value as the corresponding 87These functions return the same type and value as the corresponding
88standard functions. 88standard functions.