sync with OpenBSD -current

lib/libcrypto/cms/cms_att.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_att.c,v 1.11 2023/07/08 08:26:26 beck Exp $ */
+/* $OpenBSD: cms_att.c,v 1.12 2024/07/26 13:23:52 tb Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -64,7 +64,7 @@
 int
 CMS_signed_get_attr_count(const CMS_SignerInfo *si)
 {
-	return X509at_get_attr_count(si->signedAttrs);
+	return sk_X509_ATTRIBUTE_num(si->signedAttrs);
 }
 LCRYPTO_ALIAS(CMS_signed_get_attr_count);
 
@@ -86,14 +86,14 @@ LCRYPTO_ALIAS(CMS_signed_get_attr_by_OBJ);
 X509_ATTRIBUTE *
 CMS_signed_get_attr(const CMS_SignerInfo *si, int loc)
 {
-	return X509at_get_attr(si->signedAttrs, loc);
+	return sk_X509_ATTRIBUTE_value(si->signedAttrs, loc);
 }
 LCRYPTO_ALIAS(CMS_signed_get_attr);
 
 X509_ATTRIBUTE *
 CMS_signed_delete_attr(CMS_SignerInfo *si, int loc)
 {
-	return X509at_delete_attr(si->signedAttrs, loc);
+	return sk_X509_ATTRIBUTE_delete(si->signedAttrs, loc);
 }
 LCRYPTO_ALIAS(CMS_signed_delete_attr);
 
@@ -147,7 +147,7 @@ LCRYPTO_ALIAS(CMS_signed_get0_data_by_OBJ);
 int
 CMS_unsigned_get_attr_count(const CMS_SignerInfo *si)
 {
-	return X509at_get_attr_count(si->unsignedAttrs);
+	return sk_X509_ATTRIBUTE_num(si->unsignedAttrs);
 }
 LCRYPTO_ALIAS(CMS_unsigned_get_attr_count);
 
@@ -169,14 +169,14 @@ LCRYPTO_ALIAS(CMS_unsigned_get_attr_by_OBJ);
 X509_ATTRIBUTE *
 CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc)
 {
-	return X509at_get_attr(si->unsignedAttrs, loc);
+	return sk_X509_ATTRIBUTE_value(si->unsignedAttrs, loc);
 }
 LCRYPTO_ALIAS(CMS_unsigned_get_attr);
 
 X509_ATTRIBUTE *
 CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc)
 {
-	return X509at_delete_attr(si->unsignedAttrs, loc);
+	return sk_X509_ATTRIBUTE_delete(si->unsignedAttrs, loc);
 }
 LCRYPTO_ALIAS(CMS_unsigned_delete_attr);
 

lib/libcrypto/hidden/openssl/x509.h

@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.8 2024/07/15 18:50:42 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.9 2024/07/26 13:34:56 tb Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -243,11 +243,11 @@ LCRYPTO_USED(X509_EXTENSION_set_data);
 LCRYPTO_USED(X509_EXTENSION_get_object);
 LCRYPTO_USED(X509_EXTENSION_get_data);
 LCRYPTO_USED(X509_EXTENSION_get_critical);
-LCRYPTO_USED(X509at_get_attr_count);
+LCRYPTO_UNUSED(X509at_get_attr_count);
 LCRYPTO_USED(X509at_get_attr_by_NID);
 LCRYPTO_USED(X509at_get_attr_by_OBJ);
-LCRYPTO_USED(X509at_get_attr);
-LCRYPTO_USED(X509at_delete_attr);
+LCRYPTO_UNUSED(X509at_get_attr);
+LCRYPTO_UNUSED(X509at_delete_attr);
 LCRYPTO_USED(X509at_add1_attr);
 LCRYPTO_USED(X509at_add1_attr_by_OBJ);
 LCRYPTO_USED(X509at_add1_attr_by_NID);

lib/libcrypto/man/ERR_load_strings.3

@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ERR_load_strings.3,v 1.7 2018/03/27 17:35:50 schwarze Exp $
+.\"	$OpenBSD: ERR_load_strings.3,v 1.8 2024/07/26 03:40:43 tb Exp $
 .\"	OpenSSL 05ea606a May 20 20:52:46 2016 -0400
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>.
@@ -48,7 +48,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 27 2018 $
+.Dd $Mdocdate: July 26 2024 $
 .Dt ERR_LOAD_STRINGS 3
 .Os
 .Sh NAME
@@ -79,8 +79,7 @@ registers error strings for library number
 .Fa str
 is an array of error string data:
 .Bd -literal -offset indent
-typedef struct ERR_string_data_st
-{
+typedef struct ERR_string_data_st {
         unsigned long error;
         char *string;
 } ERR_STRING_DATA;

lib/libcrypto/x509/x509_att.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_att.c,v 1.22 2023/02/16 08:38:17 tb Exp $ */
+/* $OpenBSD: x509_att.c,v 1.24 2024/07/26 13:33:39 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -71,7 +71,8 @@
 int
 X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
 {
-	return sk_X509_ATTRIBUTE_num(x);
+	X509error(ERR_R_DISABLED);
+	return 0;
 }
 LCRYPTO_ALIAS(X509at_get_attr_count);
 
@@ -112,22 +113,16 @@ LCRYPTO_ALIAS(X509at_get_attr_by_OBJ);
 X509_ATTRIBUTE *
 X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc)
 {
-	if (x == NULL || sk_X509_ATTRIBUTE_num(x) <= loc || loc < 0)
-		return NULL;
-	else
-		return sk_X509_ATTRIBUTE_value(x, loc);
+	X509error(ERR_R_DISABLED);
+	return NULL;
 }
 LCRYPTO_ALIAS(X509at_get_attr);
 
 X509_ATTRIBUTE *
 X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
 {
-	X509_ATTRIBUTE *ret;
-
-	if (x == NULL || sk_X509_ATTRIBUTE_num(x) <= loc || loc < 0)
-		return (NULL);
-	ret = sk_X509_ATTRIBUTE_delete(x, loc);
-	return (ret);
+	X509error(ERR_R_DISABLED);
+	return NULL;
 }
 LCRYPTO_ALIAS(X509at_delete_attr);
 
@@ -227,7 +222,7 @@ X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, const ASN1_OBJECT *obj,
 		return NULL;
 	if ((lastpos <= -2) && (X509at_get_attr_by_OBJ(x, obj, i) != -1))
 		return NULL;
-	at = X509at_get_attr(x, i);
+	at = sk_X509_ATTRIBUTE_value(x, i);
 	if (lastpos <= -3 && (X509_ATTRIBUTE_count(at) != 1))
 		return NULL;
 	return X509_ATTRIBUTE_get0_data(at, 0, type, NULL);

lib/libcrypto/x509/x509_req.c

@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_req.c,v 1.41 2024/05/09 14:29:08 tb Exp $ */
+/* $OpenBSD: x509_req.c,v 1.42 2024/07/26 13:24:39 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -236,7 +236,7 @@ LCRYPTO_ALIAS(X509_REQ_add_extensions);
 int
 X509_REQ_get_attr_count(const X509_REQ *req)
 {
-	return X509at_get_attr_count(req->req_info->attributes);
+	return sk_X509_ATTRIBUTE_num(req->req_info->attributes);
 }
 LCRYPTO_ALIAS(X509_REQ_get_attr_count);
 
@@ -258,14 +258,14 @@ LCRYPTO_ALIAS(X509_REQ_get_attr_by_OBJ);
 X509_ATTRIBUTE *
 X509_REQ_get_attr(const X509_REQ *req, int loc)
 {
-	return X509at_get_attr(req->req_info->attributes, loc);
+	return sk_X509_ATTRIBUTE_value(req->req_info->attributes, loc);
 }
 LCRYPTO_ALIAS(X509_REQ_get_attr);
 
 X509_ATTRIBUTE *
 X509_REQ_delete_attr(X509_REQ *req, int loc)
 {
-	return X509at_delete_attr(req->req_info->attributes, loc);
+	return sk_X509_ATTRIBUTE_delete(req->req_info->attributes, loc);
 }
 LCRYPTO_ALIAS(X509_REQ_delete_attr);