summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libcrypto/man/EVP_DigestInit.313
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/libcrypto/man/EVP_DigestInit.3 b/lib/libcrypto/man/EVP_DigestInit.3
index 2100065bf82..9941fbdf6ec 100644
--- a/lib/libcrypto/man/EVP_DigestInit.3
+++ b/lib/libcrypto/man/EVP_DigestInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_DigestInit.3,v 1.4 2016/11/26 17:12:45 schwarze Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.5 2017/02/28 14:22:49 jsing Exp $
.\" OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000
.\"
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: November 26 2016 $
+.Dd $Mdocdate: February 28 2017 $
.Dt EVP_DIGESTINIT 3
.Os
.Sh NAME
@@ -76,6 +76,7 @@
.Nm EVP_md_null ,
.Nm EVP_md2 ,
.Nm EVP_md5 ,
+.Nm EVP_md5_sha1 ,
.Nm EVP_sha1 ,
.Nm EVP_sha224 ,
.Nm EVP_sha256 ,
@@ -183,6 +184,8 @@
.Ft const EVP_MD *
.Fn EVP_md5 void
.Ft const EVP_MD *
+.Fn EVP_md5_sha1 void
+.Ft const EVP_MD *
.Fn EVP_sha1 void
.Ft const EVP_MD *
.Fn EVP_sha224 void
@@ -380,6 +383,11 @@ return
structures for the MD2, MD5, SHA1, SHA224, SHA256, SHA384, SHA512 and
RIPEMD160 digest algorithms respectively.
.Pp
+.Fn EVP_md5_sha1
+returns an
+.Vt EVP_MD
+structure that provides concatenated MD5 and SHA1 message digests.
+.Pp
.Fn EVP_dss
and
.Fn EVP_dss1
@@ -491,6 +499,7 @@ return the digest or block size in bytes.
.Fn EVP_md_null ,
.Fn EVP_md2 ,
.Fn EVP_md5 ,
+.Fn EVP_md5_sha1 ,
.Fn EVP_sha1 ,
.Fn EVP_dss ,
.Fn EVP_dss1 ,