The branch OpenSSL_1_1_1-stable has been updated
via 3814dfe8df847d49f8040b3b9cbad4a8a494d46b (commit)
from 3986b9bb6bb319ff4b2365a7d570308d0e70cd54 (commit)
- Log -----------------------------------------------------------------
commit 3814dfe8df847d49f8040b3b9cbad4a8a494d46b
Author: Rich Salz <rs...@akamai.com>
Date: Tue Nov 26 09:16:41 2019 -0500
Fix docs for CRYPTO_secure_allocated
Fixes #9300
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10523)
(cherry picked from commit 20c09f00346aec3a20ceacc9c9d44c5f050e13dd)
-----------------------------------------------------------------------
Summary of changes:
doc/man3/OPENSSL_secure_malloc.pod | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/doc/man3/OPENSSL_secure_malloc.pod
b/doc/man3/OPENSSL_secure_malloc.pod
index 6c39538351..86c2522afe 100644
--- a/doc/man3/OPENSSL_secure_malloc.pod
+++ b/doc/man3/OPENSSL_secure_malloc.pod
@@ -7,6 +7,7 @@ CRYPTO_secure_malloc_done, OPENSSL_secure_malloc,
CRYPTO_secure_malloc,
OPENSSL_secure_zalloc, CRYPTO_secure_zalloc, OPENSSL_secure_free,
CRYPTO_secure_free, OPENSSL_secure_clear_free,
CRYPTO_secure_clear_free, OPENSSL_secure_actual_size,
+CRYPTO_secure_allocated,
CRYPTO_secure_used - secure heap storage
=head1 SYNOPSIS
@@ -33,6 +34,7 @@ CRYPTO_secure_used - secure heap storage
size_t OPENSSL_secure_actual_size(const void *ptr);
+ int CRYPTO_secure_allocated(const void *ptr);
size_t CRYPTO_secure_used();
=head1 DESCRIPTION
@@ -90,6 +92,8 @@ OPENSSL_secure_actual_size() tells the actual size allocated
to the
pointer; implementations may allocate more space than initially
requested, in order to "round up" and reduce secure heap fragmentation.
+OPENSSL_secure_allocated() tells if a pointer is allocated in the secure heap.
+
CRYPTO_secure_used() returns the number of bytes allocated in the
secure heap.
