7 files changed, 11 insertions, 206 deletions

diff --git a/src/lib/libcrypto/man/EVP_PKEY_add1_attr.3 b/src/lib/libcrypto/man/EVP_PKEY_add1_attr.3
deleted file mode 100644
index ae910b167a..0000000000
--- a/src/lib/libcrypto/man/EVP_PKEY_add1_attr.3
+++ /dev/null
@@ -1,188 +0,0 @@
-.\" $OpenBSD: EVP_PKEY_add1_attr.3,v 1.3 2021/10/26 18:50:38 jmc Exp $
-.\"
-.\" Copyright (c) 2021 Ingo Schwarze <schwarze@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: October 26 2021 $
-.Dt EVP_PKEY_ADD1_ATTR 3
-.Os
-.Sh NAME
-.Nm EVP_PKEY_add1_attr ,
-.Nm EVP_PKEY_add1_attr_by_OBJ ,
-.Nm EVP_PKEY_add1_attr_by_NID ,
-.Nm EVP_PKEY_add1_attr_by_txt ,
-.Nm EVP_PKEY_delete_attr ,
-.Nm EVP_PKEY_get_attr ,
-.Nm EVP_PKEY_get_attr_count ,
-.Nm EVP_PKEY_get_attr_by_OBJ ,
-.Nm EVP_PKEY_get_attr_by_NID
-.Nd X.501 Attributes of private keys
-.Sh SYNOPSIS
-.In openssl/x509.h
-.Ft int
-.Fo EVP_PKEY_add1_attr
-.Fa "EVP_PKEY *key"
-.Fa "X509_ATTRIBUTE *attr"
-.Fc
-.Ft int
-.Fo EVP_PKEY_add1_attr_by_OBJ
-.Fa "EVP_PKEY *key"
-.Fa "const ASN1_OBJECT *obj"
-.Fa "int type"
-.Fa "const unsigned char *data"
-.Fa "int len"
-.Fc
-.Ft int
-.Fo EVP_PKEY_add1_attr_by_NID
-.Fa "EVP_PKEY *key"
-.Fa "int nid"
-.Fa "int type"
-.Fa "const unsigned char *data"
-.Fa "int len"
-.Fc
-.Ft int
-.Fo EVP_PKEY_add1_attr_by_txt
-.Fa "EVP_PKEY *key"
-.Fa "const char *name"
-.Fa "int type"
-.Fa "const unsigned char *data"
-.Fa "int len"
-.Fc
-.Ft X509_ATTRIBUTE *
-.Fo EVP_PKEY_delete_attr
-.Fa "EVP_PKEY *key"
-.Fa "int index"
-.Fc
-.Ft X509_ATTRIBUTE *
-.Fo EVP_PKEY_get_attr
-.Fa "const EVP_PKEY *key"
-.Fa "int index"
-.Fc
-.Ft int
-.Fo EVP_PKEY_get_attr_count
-.Fa "const EVP_PKEY *key"
-.Fc
-.Ft int
-.Fo EVP_PKEY_get_attr_by_OBJ
-.Fa "const EVP_PKEY *key"
-.Fa "const ASN1_OBJECT *obj"
-.Fa "int start_after"
-.Fc
-.Ft int
-.Fo EVP_PKEY_get_attr_by_NID
-.Fa "const EVP_PKEY *key"
-.Fa "int nid"
-.Fa "int start_after"
-.Fc
-.Sh DESCRIPTION
-These functions support associating an array of X.501 Attributes
-with a private key.
-Such attributes can for example be included in PKCS#12 structures.
-.Pp
-.Fn EVP_PKEY_add1_attr
-appends a deep copy of the
-.Fa attr
-using
-.Xr X509at_add1_attr 3 .
-.Pp
-.Fn EVP_PKEY_add1_attr_by_OBJ ,
-.Fn EVP_PKEY_add1_attr_by_NID ,
-and
-.Fn EVP_PKEY_add1_attr_by_txt
-create a new X.501 Attribute object using
-.Xr X509_ATTRIBUTE_create_by_OBJ 3 ,
-.Xr X509_ATTRIBUTE_create_by_NID 3 ,
-or
-.Xr X509_ATTRIBUTE_create_by_txt 3 ,
-respectively, and append it using
-.Xr X509at_add1_attr 3 .
-.Pp
-.Fn EVP_PKEY_delete_attr
-deletes the attribute with the zero-based
-.Fa index
-using
-.Xr X509at_delete_attr 3 .
-.Pp
-.Fn EVP_PKEY_get_attr
-returns the attribute with the zero-based
-.Fa index
-using
-.Xr X509at_get_attr 3 .
-.Pp
-.Fn EVP_PKEY_get_attr_count
-returns the number of attributes currently associated with the
-.Fa key
-using
-.Xr X509at_get_attr_count 3 .
-.Pp
-.Fn EVP_PKEY_get_attr_by_OBJ
-and
-.Fn EVP_PKEY_get_attr_by_NID
-search for an attribute of the type
-.Fa obj
-or
-.Fa nid
-using
-.Xr X509at_get_attr_by_OBJ 3
-or
-.Xr X509at_get_attr_by_NID 3 ,
-respectively.
-.Sh RETURN VALUES
-.Fn EVP_PKEY_add1_attr ,
-.Fn EVP_PKEY_add1_attr_by_OBJ ,
-.Fn EVP_PKEY_add1_attr_by_NID ,
-and
-.Fn EVP_PKEY_add1_attr_by_txt
-return 1 for success or 0 for failure.
-.Pp
-.Fn EVP_PKEY_delete_attr
-and
-.Fn EVP_PKEY_get_attr
-return the deleted or requested attribute or
-.Dv NULL
-if the requested index is negative or greater than or equal to
-the current number of attributes associated with the
-.Fa key .
-.Pp
-.Fn EVP_PKEY_get_attr_count
-returns the current number of attributes.
-.Pp
-.Fn EVP_PKEY_get_attr_by_OBJ
-and
-.Fn EVP_PKEY_get_attr_by_NID
-return the index of the first attribute that has an index greater than
-.Fa start_after
-and a type matching
-.Fa obj
-or
-.Fa nid ,
-respectively, or \-1 on failure.
-In addition,
-.Fn EVP_PKEY_get_attr_by_NID
-returns \-2 if
-.Xr OBJ_nid2obj 3
-fails on the requested
-.Fa nid .
-.Sh SEE ALSO
-.Xr EVP_PKEY_new 3 ,
-.Xr OBJ_nid2obj 3 ,
-.Xr PKCS12_create 3 ,
-.Xr X509_ATTRIBUTE_create_by_OBJ 3 ,
-.Xr X509_ATTRIBUTE_new 3 ,
-.Xr X509at_add1_attr 3 ,
-.Xr X509at_get_attr 3
-.Sh HISTORY
-These functions first appeared in OpenSSL 0.9.8
-and have been available since
-.Ox 4.5 .
diff --git a/src/lib/libcrypto/man/EVP_PKEY_new.3 b/src/lib/libcrypto/man/EVP_PKEY_new.3
index 36f3886856..ea22b5eb08 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_new.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_PKEY_new.3,v 1.19 2024/07/21 08:36:43 tb Exp $
+.\" $OpenBSD: EVP_PKEY_new.3,v 1.20 2024/08/24 09:15:36 tb Exp $
 .\" full merge up to: OpenSSL 4dcfdfce May 27 11:50:05 2020 +0100
 .\"
 .\" 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: July 21 2024 $
+.Dd $Mdocdate: August 24 2024 $
 .Dt EVP_PKEY_NEW 3
 .Os
 .Sh NAME
@@ -269,7 +269,6 @@ return 1 for success or 0 for failure.
 .Xr d2i_PrivateKey 3 ,
 .Xr evp 3 ,
 .Xr EVP_PKCS82PKEY 3 ,
-.Xr EVP_PKEY_add1_attr 3 ,
 .Xr EVP_PKEY_asn1_new 3 ,
 .Xr EVP_PKEY_check 3 ,
 .Xr EVP_PKEY_cmp 3 ,
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 4973ea744c..f2f23a0734 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.290 2024/08/24 07:48:37 tb Exp $
+# $OpenBSD: Makefile,v 1.291 2024/08/24 09:15:36 tb Exp $
 
 .include <bsd.own.mk>
 
@@ -177,7 +177,6 @@ MAN=	\
         EVP_PKEY_CTX_new.3 \
         EVP_PKEY_CTX_set_hkdf_md.3 \
         EVP_PKEY_CTX_set_tls1_prf_md.3 \
-        EVP_PKEY_add1_attr.3 \
         EVP_PKEY_asn1_get_count.3 \
         EVP_PKEY_asn1_new.3 \
         EVP_PKEY_check.3 \
diff --git a/src/lib/libcrypto/man/X509_ATTRIBUTE_new.3 b/src/lib/libcrypto/man/X509_ATTRIBUTE_new.3
index 5dcdc6e214..8d664cd69e 100644
--- a/src/lib/libcrypto/man/X509_ATTRIBUTE_new.3
+++ b/src/lib/libcrypto/man/X509_ATTRIBUTE_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_ATTRIBUTE_new.3,v 1.16 2021/10/26 12:56:48 schwarze Exp $
+.\" $OpenBSD: X509_ATTRIBUTE_new.3,v 1.17 2024/08/24 09:15:36 tb Exp $
 .\"
 .\" Copyright (c) 2016, 2021 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 26 2021 $
+.Dd $Mdocdate: August 24 2024 $
 .Dt X509_ATTRIBUTE_NEW 3
 .Os
 .Sh NAME
@@ -111,7 +111,6 @@ fails on
 .Fa nid .
 .Sh SEE ALSO
 .Xr d2i_X509_ATTRIBUTE 3 ,
-.Xr EVP_PKEY_add1_attr 3 ,
 .Xr OBJ_nid2obj 3 ,
 .Xr PKCS12_SAFEBAG_new 3 ,
 .Xr PKCS7_add_attribute 3 ,
diff --git a/src/lib/libcrypto/man/X509at_add1_attr.3 b/src/lib/libcrypto/man/X509at_add1_attr.3
index 3d29c56ef9..126b1b41ba 100644
--- a/src/lib/libcrypto/man/X509at_add1_attr.3
+++ b/src/lib/libcrypto/man/X509at_add1_attr.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509at_add1_attr.3,v 1.5 2021/10/26 12:56:48 schwarze Exp $
+.\" $OpenBSD: X509at_add1_attr.3,v 1.6 2024/08/24 09:15:36 tb Exp $
 .\"
 .\" Copyright (c) 2021 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 26 2021 $
+.Dd $Mdocdate: August 24 2024 $
 .Dt X509AT_ADD1_ATTR 3
 .Os
 .Sh NAME
@@ -120,7 +120,6 @@ or if the requested
 is negative or greater than or equal to the number of objects in
 .Pf * Fa attrs .
 .Sh SEE ALSO
-.Xr EVP_PKEY_add1_attr 3 ,
 .Xr OBJ_nid2obj 3 ,
 .Xr PKCS8_pkey_add1_attr_by_NID 3 ,
 .Xr STACK_OF 3 ,
diff --git a/src/lib/libcrypto/man/X509at_get_attr.3 b/src/lib/libcrypto/man/X509at_get_attr.3
index 82f786a417..3afdb0df41 100644
--- a/src/lib/libcrypto/man/X509at_get_attr.3
+++ b/src/lib/libcrypto/man/X509at_get_attr.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509at_get_attr.3,v 1.7 2022/03/28 08:18:13 claudio Exp $
+.\" $OpenBSD: X509at_get_attr.3,v 1.8 2024/08/24 09:15:36 tb Exp $
 .\"
 .\" Copyright (c) 2021 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 28 2022 $
+.Dd $Mdocdate: August 24 2024 $
 .Dt X509AT_GET_ATTR 3
 .Os
 .Sh NAME
@@ -138,14 +138,12 @@ or
 .Dv NULL
 on failure.
 .Sh SEE ALSO
-.Xr EVP_PKEY_get_attr 3 ,
 .Xr OBJ_nid2obj 3 ,
 .Xr PKCS8_pkey_get0_attrs 3 ,
 .Xr STACK_OF 3 ,
 .Xr X509_ATTRIBUTE_get0_data 3 ,
 .Xr X509_ATTRIBUTE_new 3 ,
 .Xr X509_REQ_get_attr 3 ,
-.Xr X509at_add1_attr 3
 .Sh HISTORY
 .Fn X509at_get_attr ,
 .Fn X509at_get_attr_count ,
diff --git a/src/lib/libcrypto/man/evp.3 b/src/lib/libcrypto/man/evp.3
index 8a3133bd07..aea8f051f3 100644
--- a/src/lib/libcrypto/man/evp.3
+++ b/src/lib/libcrypto/man/evp.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: evp.3,v 1.30 2024/03/19 17:34:05 tb Exp $
+.\" $OpenBSD: evp.3,v 1.31 2024/08/24 09:15:36 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 19 2024 $
+.Dd $Mdocdate: August 24 2024 $
 .Dt EVP 3
 .Os
 .Sh NAME
@@ -189,7 +189,6 @@ family of functions provides base64 encoding and decoding.
 .Xr EVP_MD_nid 3 ,
 .Xr EVP_OpenInit 3 ,
 .Xr EVP_PKCS82PKEY 3 ,
-.Xr EVP_PKEY_add1_attr 3 ,
 .Xr EVP_PKEY_asn1_get_count 3 ,
 .Xr EVP_PKEY_asn1_new 3 ,
 .Xr EVP_PKEY_check 3 ,