3 files changed, 8 insertions, 37 deletions

diff --git a/src/lib/libcrypto/man/EVP_DigestInit.3 b/src/lib/libcrypto/man/EVP_DigestInit.3
index a578d99e1a..bb7a847d4f 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.32 2024/03/05 17:21:40 tb Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.33 2024/03/19 17:34:05 tb Exp $
 .\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000
 .\" selective merge up to: OpenSSL 24a535ea Sep 22 13:14:20 2020 +0100
 .\"
@@ -70,7 +70,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 5 2024 $
+.Dd $Mdocdate: March 19 2024 $
 .Dt EVP_DIGESTINIT 3
 .Os
 .Sh NAME
@@ -547,7 +547,7 @@ main(int argc, char *argv[])
 .Xr OCSP_request_sign 3 ,
 .Xr PKCS5_PBKDF2_HMAC 3 ,
 .Xr PKCS7_sign_add_signer 3 ,
-.Xr X509_ALGOR_set_md 3 ,
+.Xr X509_ALGOR_set0 3 ,
 .Xr X509_digest 3 ,
 .Xr X509_sign 3
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/X509_ALGOR_dup.3 b/src/lib/libcrypto/man/X509_ALGOR_dup.3
index 29fd9a60f4..ef7ca75863 100644
--- a/src/lib/libcrypto/man/X509_ALGOR_dup.3
+++ b/src/lib/libcrypto/man/X509_ALGOR_dup.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: X509_ALGOR_dup.3,v 1.22 2023/10/13 05:49:34 tb Exp $
+.\"     $OpenBSD: X509_ALGOR_dup.3,v 1.23 2024/03/19 17:34:05 tb Exp $
 .\"     OpenSSL 4692340e Jun 7 15:49:08 2016 -0400
 .\"
 .\" This file is a derived work.
@@ -66,7 +66,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 13 2023 $
+.Dd $Mdocdate: March 19 2024 $
 .Dt X509_ALGOR_DUP 3
 .Os
 .Sh NAME
@@ -75,7 +75,6 @@
 .Nm X509_ALGOR_dup ,
 .Nm X509_ALGOR_set0 ,
 .Nm X509_ALGOR_get0 ,
-.Nm X509_ALGOR_set_md ,
 .Nm X509_ALGOR_cmp
 .Nd create, change, and inspect algorithm identifiers
 .Sh SYNOPSIS
@@ -102,11 +101,6 @@
 .Fa "const void **ppval"
 .Fa "const X509_ALGOR *alg"
 .Fc
-.Ft void
-.Fo X509_ALGOR_set_md
-.Fa "X509_ALGOR *alg"
-.Fa "const EVP_MD *md"
-.Fc
 .Ft int
 .Fo X509_ALGOR_cmp
 .Fa "const X509_ALGOR *a"
@@ -240,22 +234,6 @@ then
 .Pf * Fa ppval Ns 's
 value is undefined.
 .Pp
-.Fn X509_ALGOR_set_md
-sets
-.Fa alg
-to appropriate values for the message digest
-.Fa md .
-If the
-.Dv EVP_MD_FLAG_DIGALGID_ABSENT
-flag is not set on
-.Fa md ,
-.Fn X509_ALGOR_set_md
-can leave
-.Fa alg
-in a corrupted state due to memory allocation failure.
-This problem can be avoided by preallocating with an error-checked call to
-.Fn X509_ALGOR_set0 alg NULL 0 NULL .
-.Pp
 .Fn X509_ALGOR_cmp
 compares
 .Fa a
@@ -317,10 +295,3 @@ first appeared in OpenSSL 0.9.8h and have been available since
 first appeared in OpenSSL 0.9.8zd, 1.0.0p, and 1.0.1k
 and has been available since
 .Ox 4.9 .
-.Pp
-.Fn X509_ALGOR_set_md
-first appeared in OpenSSL 1.0.1 and has been available since
-.Ox 5.3 .
-.Sh BUGS
-.Fn X509_ALGOR_set_md
-can fail but cannot communicate failure to the caller.
diff --git a/src/lib/libcrypto/man/evp.3 b/src/lib/libcrypto/man/evp.3
index 0222dd66b4..8a3133bd07 100644
--- a/src/lib/libcrypto/man/evp.3
+++ b/src/lib/libcrypto/man/evp.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: evp.3,v 1.29 2024/03/06 02:34:14 tb Exp $
+.\" $OpenBSD: evp.3,v 1.30 2024/03/19 17:34:05 tb Exp $
 .\" full merge up to: OpenSSL man7/evp 24a535ea Sep 22 13:14:20 2020 +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: March 6 2024 $
+.Dd $Mdocdate: March 19 2024 $
 .Dt EVP 3
 .Os
 .Sh NAME
@@ -232,7 +232,7 @@ family of functions provides base64 encoding and decoding.
 .Xr PKCS7_sign 3 ,
 .Xr RSA_pkey_ctx_ctrl 3 ,
 .Xr SSL_CTX_set_tlsext_ticket_key_cb 3 ,
-.Xr X509_ALGOR_set_md 3 ,
+.Xr X509_ALGOR_set0 3 ,
 .Xr X509_check_private_key 3 ,
 .Xr X509_digest 3 ,
 .Xr X509_get_pubkey 3 ,