From: Rich Salz Date: Tue, 26 Nov 2019 14:16:41 +0000 (-0500) Subject: Fix docs for CRYPTO_secure_allocated X-Git-Tag: openssl-3.0.0-alpha1~831 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=20c09f00346aec3a20ceacc9c9d44c5f050e13dd;p=oweals%2Fopenssl.git Fix docs for CRYPTO_secure_allocated Fixes #9300 Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10523) --- diff --git a/doc/man3/OPENSSL_secure_malloc.pod b/doc/man3/OPENSSL_secure_malloc.pod index feaa12d3a8..9c70d39338 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. diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 6de82cfc21..f009128d3a 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -316,7 +316,6 @@ CRYPTO_ocb128_setiv CRYPTO_ocb128_tag CRYPTO_ofb128_encrypt CRYPTO_secure_actual_size -CRYPTO_secure_allocated CRYPTO_xts128_encrypt Camellia_cbc_encrypt Camellia_cfb128_encrypt