Add default provider support for Keccak 224, 256, 384 and 512
Fixes issue openssl#13033
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16594)
diff --git a/doc/build.info b/doc/build.info
index 542ddb8..fcf2c1c 100644
--- a/doc/build.info
+++ b/doc/build.info
@@ -4199,6 +4199,10 @@
GENERATE[html/man7/EVP_MD-BLAKE2.html]=man7/EVP_MD-BLAKE2.pod
DEPEND[man/man7/EVP_MD-BLAKE2.7]=man7/EVP_MD-BLAKE2.pod
GENERATE[man/man7/EVP_MD-BLAKE2.7]=man7/EVP_MD-BLAKE2.pod
+DEPEND[html/man7/EVP_MD-KECCAK.html]=man7/EVP_MD-KECCAK.pod
+GENERATE[html/man7/EVP_MD-KECCAK.html]=man7/EVP_MD-KECCAK.pod
+DEPEND[man/man7/EVP_MD-KECCAK.7]=man7/EVP_MD-KECCAK.pod
+GENERATE[man/man7/EVP_MD-KECCAK.7]=man7/EVP_MD-KECCAK.pod
DEPEND[html/man7/EVP_MD-MD2.html]=man7/EVP_MD-MD2.pod
GENERATE[html/man7/EVP_MD-MD2.html]=man7/EVP_MD-MD2.pod
DEPEND[man/man7/EVP_MD-MD2.7]=man7/EVP_MD-MD2.pod
@@ -4579,6 +4583,7 @@
html/man7/EVP_MAC-Poly1305.html \
html/man7/EVP_MAC-Siphash.html \
html/man7/EVP_MD-BLAKE2.html \
+html/man7/EVP_MD-KECCAK.html \
html/man7/EVP_MD-MD2.html \
html/man7/EVP_MD-MD4.html \
html/man7/EVP_MD-MD5-SHA1.html \
@@ -4702,6 +4707,7 @@
man/man7/EVP_MAC-Poly1305.7 \
man/man7/EVP_MAC-Siphash.7 \
man/man7/EVP_MD-BLAKE2.7 \
+man/man7/EVP_MD-KECCAK.7 \
man/man7/EVP_MD-MD2.7 \
man/man7/EVP_MD-MD4.7 \
man/man7/EVP_MD-MD5-SHA1.7 \
diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index b6f4029..c78d06b 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -387,6 +387,22 @@
SHA-3 512 Digest
+=item B<keccak-224>
+
+KECCAK 224 Digest
+
+=item B<keccak-256>
+
+KECCAK 256 Digest
+
+=item B<keccak-384>
+
+KECCAK 384 Digest
+
+=item B<keccak-512>
+
+KECCAK 512 Digest
+
=item B<shake128>
SHA-3 SHAKE128 Digest
diff --git a/doc/man7/EVP_MD-KECCAK.pod b/doc/man7/EVP_MD-KECCAK.pod
new file mode 100644
index 0000000..d854db9
--- /dev/null
+++ b/doc/man7/EVP_MD-KECCAK.pod
@@ -0,0 +1,46 @@
+=pod
+
+=head1 NAME
+
+EVP_MD-KECCAK - The KECCAK EVP_MD implementations
+
+=head1 DESCRIPTION
+
+Support for computing KECCAK digests through the B<EVP_MD> API.
+
+=head2 Identities
+
+This implementation is available in the default provider and
+includes the following varieties:
+
+=over 4
+
+=item "KECCAK-224"
+
+=item "KECCAK-256"
+
+=item "KECCAK-384"
+
+=item "KECCAK-512"
+
+=back
+
+=head2 Gettable Parameters
+
+This implementation supports the common gettable parameters described
+in L<EVP_MD-common(7)>.
+
+=head1 SEE ALSO
+
+L<provider-digest(7)>, L<OSSL_PROVIDER-default(7)>
+
+=head1 COPYRIGHT
+
+Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the Apache License 2.0 (the "License"). You may not use
+this file except in compliance with the License. You can obtain a copy
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man7/OSSL_PROVIDER-default.pod b/doc/man7/OSSL_PROVIDER-default.pod
index 14d590c..492132b 100644
--- a/doc/man7/OSSL_PROVIDER-default.pod
+++ b/doc/man7/OSSL_PROVIDER-default.pod
@@ -57,6 +57,8 @@
=item SHA3, see L<EVP_MD-SHA3(7)>
+=item KECCAK, see L<EVP_MD-KECCAK(7)>
+
=item KECCAK-KMAC, see L<EVP_MD-KECCAK-KMAC(7)>
=item SHAKE, see L<EVP_MD-SHAKE(7)>
diff --git a/doc/man7/provider-digest.pod b/doc/man7/provider-digest.pod
index 63f30d7..5f44df9 100644
--- a/doc/man7/provider-digest.pod
+++ b/doc/man7/provider-digest.pod
@@ -266,8 +266,8 @@
L<EVP_MD-common(7)>, L<EVP_MD-BLAKE2(7)>, L<EVP_MD-MD2(7)>,
L<EVP_MD-MD4(7)>, L<EVP_MD-MD5(7)>, L<EVP_MD-MD5-SHA1(7)>,
L<EVP_MD-MDC2(7)>, L<EVP_MD-RIPEMD160(7)>, L<EVP_MD-SHA1(7)>,
-L<EVP_MD-SHA2(7)>, L<EVP_MD-SHA3(7)>, L<EVP_MD-SHAKE(7)>,
-L<EVP_MD-SM3(7)>, L<EVP_MD-WHIRLPOOL(7)>,
+L<EVP_MD-SHA2(7)>, L<EVP_MD-SHA3(7)>, L<EVP_MD-KECCAK(7)>
+L<EVP_MD-SHAKE(7)>, L<EVP_MD-SM3(7)>, L<EVP_MD-WHIRLPOOL(7)>,
L<life_cycle-digest(7)>, L<EVP_DigestInit(3)>
=head1 HISTORY
