[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  689c17883ac20d0991427b822eb98d2f0e6b78e7 (commit)
      from  9cde5f81222fd491d6d56eb8f37ab9c40a26f745 (commit)


- Log -----------------------------------------------------------------
commit 689c17883ac20d0991427b822eb98d2f0e6b78e7
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Thu Oct 26 08:06:50 2017 -0500

    Fix a couple nits in DEFINE_STACK_OF.pod
    
    Only the 'new' variant of sk_TYPE_new_reserve() deals with
    compression functions.
    
    Mention both new 'reserve' APIs as being added in OpenSSL 1.1.1.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4591)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/DEFINE_STACK_OF.pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man3/DEFINE_STACK_OF.pod b/doc/man3/DEFINE_STACK_OF.pod
index 718e9f1..43a3214 100644
--- a/doc/man3/DEFINE_STACK_OF.pod
+++ b/doc/man3/DEFINE_STACK_OF.pod
@@ -109,7 +109,7 @@ sk_TYPE_new_reserve() allocates a new stack. The new stack will have additional
 memory allocated to hold B<n> elements if B<n> is positive. The next B<n> calls
 to sk_TYPE_insert(), sk_TYPE_push() or sk_TYPE_unshift() will not fail or cause
 memory to be allocated or reallocated. If B<n> is zero or less than zero, no
-memory is allocated. sk_TYPE_reserve() also sets the comparison function
+memory is allocated. sk_TYPE_new_reserve() also sets the comparison function
 B<compare> to the newly created stack. If B<compare> is B<NULL> then no
 comparison function is used.
 
@@ -257,7 +257,7 @@ stack.
 Before OpenSSL 1.1.0, this was implemented via macros and not inline functions
 and was not a public API.
 
-sk_TYPE_new_reserve() was added in OpenSSL 1.1.1.
+sk_TYPE_reserve() and sk_TYPE_new_reserve() were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT