Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 40 insertions, 7 deletions

diff --git a/upstream/debian-unstable/man7/OSSL_PROVIDER-FIPS.7ssl b/upstream/debian-unstable/man7/OSSL_PROVIDER-FIPS.7ssl
index a281e513..4d4b65ad 100644
--- a/upstream/debian-unstable/man7/OSSL_PROVIDER-FIPS.7ssl
+++ b/upstream/debian-unstable/man7/OSSL_PROVIDER-FIPS.7ssl
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OSSL_PROVIDER-FIPS 7SSL"
-.TH OSSL_PROVIDER-FIPS 7SSL 2024-02-03 3.1.5 OpenSSL
+.TH OSSL_PROVIDER-FIPS 7SSL 2024-04-04 3.2.2-dev OpenSSL
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -118,15 +118,18 @@ The OpenSSL FIPS provider supports these operations and algorithms:
 .IX Item "SHA3, see EVP_MD-SHA3"
 .IP "KECCAK-KMAC, see \fBEVP_MD\-KECCAK\-KMAC\fR\|(7)" 4
 .IX Item "KECCAK-KMAC, see EVP_MD-KECCAK-KMAC"
+.IP "SHAKE, see \fBEVP_MD\-SHAKE\fR\|(7)" 4
+.IX Item "SHAKE, see EVP_MD-SHAKE"
 .PD
 .SS "Symmetric Ciphers"
 .IX Subsection "Symmetric Ciphers"
 .IP "AES, see \fBEVP_CIPHER\-AES\fR\|(7)" 4
 .IX Item "AES, see EVP_CIPHER-AES"
 .PD 0
-.IP "DES\-EDE3 (TripleDES), see \fBEVP_CIPHER\-DES\fR\|(7)" 4
-.IX Item "DES-EDE3 (TripleDES), see EVP_CIPHER-DES"
+.IP "3DES, see \fBEVP_CIPHER\-DES\fR\|(7)" 4
+.IX Item "3DES, see EVP_CIPHER-DES"
 .PD
+This is an unapproved algorithm.
 .SS "Message Authentication Code (MAC)"
 .IX Subsection "Message Authentication Code (MAC)"
 .IP "CMAC, see \fBEVP_MAC\-CMAC\fR\|(7)" 4
@@ -174,16 +177,28 @@ The OpenSSL FIPS provider supports these operations and algorithms:
 .IX Item "X25519, see EVP_KEYEXCH-X25519"
 .IP "X448, see \fBEVP_KEYEXCH\-X448\fR\|(7)" 4
 .IX Item "X448, see EVP_KEYEXCH-X448"
+.IP TLS1\-PRF 4
+.IX Item "TLS1-PRF"
+.IP HKDF 4
+.IX Item "HKDF"
 .PD
 .SS "Asymmetric Signature"
 .IX Subsection "Asymmetric Signature"
 .IP "RSA, see \fBEVP_SIGNATURE\-RSA\fR\|(7)" 4
 .IX Item "RSA, see EVP_SIGNATURE-RSA"
 .PD 0
-.IP "X25519, see \fBEVP_SIGNATURE\-ED25519\fR\|(7)" 4
-.IX Item "X25519, see EVP_SIGNATURE-ED25519"
-.IP "X448, see \fBEVP_SIGNATURE\-ED448\fR\|(7)" 4
-.IX Item "X448, see EVP_SIGNATURE-ED448"
+.IP "DSA, see \fBEVP_SIGNATURE\-DSA\fR\|(7)" 4
+.IX Item "DSA, see EVP_SIGNATURE-DSA"
+.IP "ED25519, see \fBEVP_SIGNATURE\-ED25519\fR\|(7)" 4
+.IX Item "ED25519, see EVP_SIGNATURE-ED25519"
+.PD
+This is an unapproved algorithm.
+.IP "ED448, see \fBEVP_SIGNATURE\-ED448\fR\|(7)" 4
+.IX Item "ED448, see EVP_SIGNATURE-ED448"
+This is an unapproved algorithm.
+.IP "ECDSA, see \fBEVP_SIGNATURE\-ECDSA\fR\|(7)" 4
+.IX Item "ECDSA, see EVP_SIGNATURE-ECDSA"
+.PD 0
 .IP "HMAC, see \fBEVP_SIGNATURE\-HMAC\fR\|(7)" 4
 .IX Item "HMAC, see EVP_SIGNATURE-HMAC"
 .IP "CMAC, see \fBEVP_SIGNATURE\-CMAC\fR\|(7)" 4
@@ -210,12 +225,30 @@ The OpenSSL FIPS provider supports these operations and algorithms:
 .IX Item "DSA, see EVP_KEYMGMT-DSA"
 .IP "RSA, see \fBEVP_KEYMGMT\-RSA\fR\|(7)" 4
 .IX Item "RSA, see EVP_KEYMGMT-RSA"
+.IP RSA-PSS 4
+.IX Item "RSA-PSS"
 .IP "EC, see \fBEVP_KEYMGMT\-EC\fR\|(7)" 4
 .IX Item "EC, see EVP_KEYMGMT-EC"
 .IP "X25519, see \fBEVP_KEYMGMT\-X25519\fR\|(7)" 4
 .IX Item "X25519, see EVP_KEYMGMT-X25519"
 .IP "X448, see \fBEVP_KEYMGMT\-X448\fR\|(7)" 4
 .IX Item "X448, see EVP_KEYMGMT-X448"
+.IP "ED25519, see \fBEVP_KEYMGMT\-ED25519\fR\|(7)" 4
+.IX Item "ED25519, see EVP_KEYMGMT-ED25519"
+.PD
+This is an unapproved algorithm.
+.IP "ED448, see \fBEVP_KEYMGMT\-ED448\fR\|(7)" 4
+.IX Item "ED448, see EVP_KEYMGMT-ED448"
+This is an unapproved algorithm.
+.IP TLS1\-PRF 4
+.IX Item "TLS1-PRF"
+.PD 0
+.IP HKDF 4
+.IX Item "HKDF"
+.IP "HMAC, see \fBEVP_KEYMGMT\-HMAC\fR\|(7)" 4
+.IX Item "HMAC, see EVP_KEYMGMT-HMAC"
+.IP "CMAC, see \fBEVP_KEYMGMT\-CMAC\fR\|(7)" 4
+.IX Item "CMAC, see EVP_KEYMGMT-CMAC"
 .PD
 .SS "Random Number Generation"
 .IX Subsection "Random Number Generation"