document EVP_sm3(3) and EVP_whirlpool(3), loosely based on the

OpenSSL 1.1.1 pages, which are still under a free license

5 files changed, 177 insertions, 6 deletions

diff --git a/src/lib/libcrypto/man/EVP_DigestInit.3 b/src/lib/libcrypto/man/EVP_DigestInit.3
index 496b07632d..cefd546af3 100644
--- a/src/lib/libcrypto/man/EVP_DigestInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_DigestInit.3,v 1.17 2019/08/14 14:05:32 schwarze Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.18 2019/08/25 17:08:20 schwarze Exp $
 .\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000
 .\" selective merge up to: OpenSSL a95d7574 Jul 2 12:16:38 2017 -0400
 .\"
@@ -68,7 +68,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 14 2019 $
+.Dd $Mdocdate: August 25 2019 $
 .Dt EVP_DIGESTINIT 3
 .Os
 .Sh NAME
@@ -678,7 +678,9 @@ main(int argc, char *argv[])
 .Xr EVP_PKEY_CTX_set_signature_md 3 ,
 .Xr EVP_PKEY_meth_set_signctx 3 ,
 .Xr EVP_SignInit 3 ,
+.Xr EVP_sm3 3 ,
 .Xr EVP_VerifyInit 3 ,
+.Xr EVP_whirlpool 3 ,
 .Xr HMAC 3 ,
 .Xr OCSP_basic_sign 3 ,
 .Xr OCSP_request_sign 3 ,
diff --git a/src/lib/libcrypto/man/EVP_sm3.3 b/src/lib/libcrypto/man/EVP_sm3.3
new file mode 100644
index 0000000000..aa6789f249
--- /dev/null
+++ b/src/lib/libcrypto/man/EVP_sm3.3
@@ -0,0 +1,82 @@
+.\" $OpenBSD: EVP_sm3.3,v 1.1 2019/08/25 17:08:20 schwarze Exp $
+.\" full merge up to: OpenSSL 21ebd2fc Aug 24 20:38:04 2018 +0800
+.\"
+.\" This file was written by Jack Lloyd <jack.lloyd@ribose.com>
+.\" and Ronald Tse <ronald.tse@ribose.com>.
+.\" Copyright (c) 2017 The OpenSSL Project.  All rights reserved.
+.\" Copyright (c) 2017 Ribose Inc.  All Rights Reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. All advertising materials mentioning features or use of this
+.\"    software must display the following acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+.\"
+.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For written permission, please contact
+.\"    openssl-core@openssl.org.
+.\"
+.\" 5. Products derived from this software may not be called "OpenSSL"
+.\"    nor may "OpenSSL" appear in their names without prior written
+.\"    permission of the OpenSSL Project.
+.\"
+.\" 6. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+.\" OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: August 25 2019 $
+.Dt EVP_SM3 3
+.Os
+.Sh NAME
+.Nm EVP_sm3
+.Nd SM3 hash function for EVP
+.Sh SYNOPSIS
+.In openssl/evp.h
+.Ft const EVP_MD *
+.Fn EVP_sm3 void
+.Sh DESCRIPTION
+SM3 is a cryptographic hash function with a 256-bit output.
+It is part of the Chinese
+.Dq Commercial Cryptography
+suite of algorithms which is required
+for certain commercial applications in China.
+.Sh RETURN VALUES
+.Fn EVP_sm3
+returns a pointer to a static
+.Vt EVP_MD
+object implementing the SM3 hash function.
+.Sh SEE ALSO
+.Xr evp 3 ,
+.Xr EVP_DigestInit 3
+.Sh STANDARDS
+GB/T 32905-2016 and GM/T 0004-2012
+.Sh HISTORY
+.Fn EVP_sm3
+first appeared in OpenSSL 1.1.1 and has been available since
+.Ox 6.5 .
diff --git a/src/lib/libcrypto/man/EVP_whirlpool.3 b/src/lib/libcrypto/man/EVP_whirlpool.3
new file mode 100644
index 0000000000..29f85bc1ae
--- /dev/null
+++ b/src/lib/libcrypto/man/EVP_whirlpool.3
@@ -0,0 +1,83 @@
+.\" $OpenBSD: EVP_whirlpool.3,v 1.1 2019/08/25 17:08:20 schwarze Exp $
+.\" full merge up to: OpenSSL bbda8ce9 Oct 31 15:43:01 2017 +0800
+.\"
+.\" This file was written by Ronald Tse <ronald.tse@ribose.com>.
+.\" Copyright (c) 2017 The OpenSSL Project.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. All advertising materials mentioning features or use of this
+.\"    software must display the following acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+.\"
+.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For written permission, please contact
+.\"    openssl-core@openssl.org.
+.\"
+.\" 5. Products derived from this software may not be called "OpenSSL"
+.\"    nor may "OpenSSL" appear in their names without prior written
+.\"    permission of the OpenSSL Project.
+.\"
+.\" 6. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+.\" OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: August 25 2019 $
+.Dt EVP_WHIRLPOOL 3
+.Os
+.Sh NAME
+.Nm EVP_whirlpool
+.Nd WHIRLPOOL hash function for EVP
+.Sh SYNOPSIS
+.In openssl/evp.h
+.Ft const EVP_MD *
+.Fn EVP_whirlpool void
+.Sh DESCRIPTION
+WHIRLPOOL is a cryptographic hash function
+producing a message digest of 512 bits.
+.Sh RETURN VALUES
+.Fn EVP_whirlpool
+returns a pointer to a static
+.Vt EVP_MD
+object implementing the WHIRLPOOL hash function.
+.Sh SEE ALSO
+.Xr evp 3 ,
+.Xr EVP_DigestInit 3
+.Sh STANDARDS
+ISO/IEC 10118-3:2004
+.Sh HISTORY
+.Fn EVP_whirlpool
+first appeared in OpenSSL 1.0.0 and has been available since
+.Ox 4.9 .
+.Sh AUTHORS
+.An -nosplit
+The WHIRLPOOL algorithm was designed by
+.An Vincent Rijmen
+and
+.An Paulo S. L. M. Barreto .
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 219450e234..e3e8e710c2 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.155 2019/08/25 06:20:22 schwarze Exp $
+# $OpenBSD: Makefile,v 1.156 2019/08/25 17:08:20 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -158,7 +158,9 @@ MAN=	\
         EVP_camellia_128_cbc.3 \
         EVP_des_cbc.3 \
         EVP_rc4.3 \
+        EVP_sm3.3 \
         EVP_sm4_cbc.3 \
+        EVP_whirlpool.3 \
         EXTENDED_KEY_USAGE_new.3 \
         GENERAL_NAME_new.3 \
         HMAC.3 \
diff --git a/src/lib/libcrypto/man/evp.3 b/src/lib/libcrypto/man/evp.3
index 2375a6c217..dad999fc19 100644
--- a/src/lib/libcrypto/man/evp.3
+++ b/src/lib/libcrypto/man/evp.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: evp.3,v 1.13 2019/06/10 09:49:48 schwarze Exp $
+.\"     $OpenBSD: evp.3,v 1.14 2019/08/25 17:08:20 schwarze Exp $
 .\"     OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>,
@@ -51,7 +51,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 10 2019 $
+.Dd $Mdocdate: August 25 2019 $
 .Dt EVP 3
 .Os
 .Sh NAME
@@ -206,5 +206,7 @@ operations are more efficient using the high level interfaces.
 .Xr EVP_rc4 3 ,
 .Xr EVP_SealInit 3 ,
 .Xr EVP_SignInit 3 ,
+.Xr EVP_sm3 3 ,
 .Xr EVP_sm4_cbc 3 ,
-.Xr EVP_VerifyInit 3
+.Xr EVP_VerifyInit 3 ,
+.Xr EVP_whirlpool 3