[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  69f982679ec0c8887a4324d8518a33808fee1cd7 (commit)
      from  0577959ceab4ca2a72a662ed12067da83cdbb3c7 (commit)


- Log -----------------------------------------------------------------
commit 69f982679ec0c8887a4324d8518a33808fee1cd7
Author: Pauli <paul.dale at oracle.com>
Date:   Tue Jun 30 11:17:20 2020 +1000

    doc: remove reference to the predecessor of SHA-1.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12322)

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

Summary of changes:
 doc/man3/SHA256_Init.pod | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/man3/SHA256_Init.pod b/doc/man3/SHA256_Init.pod
index 5aed8fa534..c8ac28de83 100644
--- a/doc/man3/SHA256_Init.pod
+++ b/doc/man3/SHA256_Init.pod
@@ -79,9 +79,6 @@ SHA512_DIGEST_LENGTH). Also note that, as for the SHA1() function above, the
 SHA224(), SHA256(), SHA384() and SHA512() functions are not thread safe if
 B<md> is NULL.
 
-The predecessor of SHA-1, SHA, is also implemented, but it should be
-used only when backward compatibility is required.
-
 =head1 RETURN VALUES
 
 SHA1(), SHA224(), SHA256(), SHA384() and SHA512() return a pointer to the hash