[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  c12a2d2728fd9eb555ab347049ebdddef9d81d7f (commit)
      from  a8b2b52fe57249f5093e190eb40def9fed9c9627 (commit)


- Log -----------------------------------------------------------------
commit c12a2d2728fd9eb555ab347049ebdddef9d81d7f
Author: Theo Buehler <tb at openbsd.org>
Date:   Wed Apr 11 12:59:25 2018 -0400

    EVP_MD_CTX_cleanup replaced with EVP_MD_CTX_reset
    
    The EVP_MD_CTX_cleanup() function was merged into EVP_MD_CTX_reset()
    which is called by EVP_MD_CTX_free().  Adjust the documentation to say
    that the latter should be used to avoid leaking memory.
    
    CLA: trivial
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5921)

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

Summary of changes:
 doc/man3/EVP_DigestSignInit.pod   | 2 +-
 doc/man3/EVP_DigestVerifyInit.pod | 2 +-
 doc/man3/EVP_SignInit.pod         | 2 +-
 doc/man3/EVP_VerifyInit.pod       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man3/EVP_DigestSignInit.pod b/doc/man3/EVP_DigestSignInit.pod
index c3513f5..176872d 100644
--- a/doc/man3/EVP_DigestSignInit.pod
+++ b/doc/man3/EVP_DigestSignInit.pod
@@ -77,7 +77,7 @@ context. This means that calls to EVP_DigestSignUpdate() and
 EVP_DigestSignFinal() can be called later to digest and sign additional data.
 
 Since only a copy of the digest context is ever finalized the context must
-be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak
+be cleaned up after use by calling EVP_MD_CTX_free() or a memory leak
 will occur.
 
 The use of EVP_PKEY_size() with these functions is discouraged because some
diff --git a/doc/man3/EVP_DigestVerifyInit.pod b/doc/man3/EVP_DigestVerifyInit.pod
index 2191b9e..603e2cd 100644
--- a/doc/man3/EVP_DigestVerifyInit.pod
+++ b/doc/man3/EVP_DigestVerifyInit.pod
@@ -76,7 +76,7 @@ context. This means that EVP_VerifyUpdate() and EVP_VerifyFinal() can
 be called later to digest and verify additional data.
 
 Since only a copy of the digest context is ever finalized the context must
-be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak
+be cleaned up after use by calling EVP_MD_CTX_free() or a memory leak
 will occur.
 
 =head1 SEE ALSO
diff --git a/doc/man3/EVP_SignInit.pod b/doc/man3/EVP_SignInit.pod
index d3fe79c..12e67f8 100644
--- a/doc/man3/EVP_SignInit.pod
+++ b/doc/man3/EVP_SignInit.pod
@@ -75,7 +75,7 @@ This means that calls to EVP_SignUpdate() and EVP_SignFinal() can be called
 later to digest and sign additional data.
 
 Since only a copy of the digest context is ever finalized the context must
-be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak
+be cleaned up after use by calling EVP_MD_CTX_free() or a memory leak
 will occur.
 
 =head1 BUGS
diff --git a/doc/man3/EVP_VerifyInit.pod b/doc/man3/EVP_VerifyInit.pod
index faabc71..f868258 100644
--- a/doc/man3/EVP_VerifyInit.pod
+++ b/doc/man3/EVP_VerifyInit.pod
@@ -57,7 +57,7 @@ This means that calls to EVP_VerifyUpdate() and EVP_VerifyFinal() can be called
 later to digest and verify additional data.
 
 Since only a copy of the digest context is ever finalized the context must
-be cleaned up after use by calling EVP_MD_CTX_cleanup() or a memory leak
+be cleaned up after use by calling EVP_MD_CTX_free() or a memory leak
 will occur.
 
 =head1 BUGS