Remove more EVP_sha() SHA-0 references.

3 files changed, 5 insertions, 6 deletions

diff --git a/src/lib/libcrypto/doc/EVP_DigestInit.pod b/src/lib/libcrypto/doc/EVP_DigestInit.pod
index 638518d994..f6a1a55a24 100644
--- a/src/lib/libcrypto/doc/EVP_DigestInit.pod
+++ b/src/lib/libcrypto/doc/EVP_DigestInit.pod
@@ -162,7 +162,7 @@ corresponding OBJECT IDENTIFIER or NID_undef if none exists.
 EVP_MD_size(), EVP_MD_block_size(), EVP_MD_CTX_size() and
 EVP_MD_CTX_block_size() return the digest or block size in bytes.
 
-EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_dss(),
+EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha1(), EVP_dss(),
 EVP_dss1() and EVP_ripemd160() return pointers to the
 corresponding EVP_MD structures.
 
@@ -263,7 +263,7 @@ EVP_MD_CTX_init(), EVP_MD_CTX_create(), EVP_MD_CTX_copy_ex(),
 EVP_MD_CTX_cleanup(), EVP_MD_CTX_destroy(), EVP_DigestInit_ex()
 and EVP_DigestFinal_ex() were added in OpenSSL 0.9.7.
 
-EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(),
+EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha1(),
 EVP_dss(), EVP_dss1() and EVP_ripemd160() were
 changed to return truely const EVP_MD * in OpenSSL 0.9.7.
 
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 01e5fef270..1ebde6fc16 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2015/09/14 01:45:03 doug Exp $
+# $OpenBSD: Makefile,v 1.24 2015/09/17 14:43:23 bcook Exp $
 
 .include <bsd.own.mk>           # for NOMAN
 
@@ -646,7 +646,6 @@ MLINKS+=\
         EVP_DigestInit.3 EVP_md5.3 \
         EVP_DigestInit.3 EVP_md_null.3 \
         EVP_DigestInit.3 EVP_ripemd160.3 \
-        EVP_DigestInit.3 EVP_sha.3 \
         EVP_DigestInit.3 EVP_sha1.3 \
         EVP_DigestSignInit.3 EVP_DigestSignUpdate.3 \
         EVP_DigestSignInit.3 EVP_DigestSignFinal.3 \
diff --git a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
index 638518d994..f6a1a55a24 100644
--- a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
+++ b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
@@ -162,7 +162,7 @@ corresponding OBJECT IDENTIFIER or NID_undef if none exists.
 EVP_MD_size(), EVP_MD_block_size(), EVP_MD_CTX_size() and
 EVP_MD_CTX_block_size() return the digest or block size in bytes.
 
-EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_dss(),
+EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha1(), EVP_dss(),
 EVP_dss1() and EVP_ripemd160() return pointers to the
 corresponding EVP_MD structures.
 
@@ -263,7 +263,7 @@ EVP_MD_CTX_init(), EVP_MD_CTX_create(), EVP_MD_CTX_copy_ex(),
 EVP_MD_CTX_cleanup(), EVP_MD_CTX_destroy(), EVP_DigestInit_ex()
 and EVP_DigestFinal_ex() were added in OpenSSL 0.9.7.
 
-EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(),
+EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha1(),
 EVP_dss(), EVP_dss1() and EVP_ripemd160() were
 changed to return truely const EVP_MD * in OpenSSL 0.9.7.