From: tb <tb@openbsd.org>
Date: Mon, 15 Jul 2024 18:50:42 +0000 (+0000)
Subject: Switch the EVP_PKEY_*attr* API to LCRYPTO_UNUSED()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6e8d98da5daaf5b97dfa0459c1f842a2ac92e684;p=openbsd

Switch the EVP_PKEY_*attr* API to LCRYPTO_UNUSED()

This would have prevented the PKCS12 oopsie.
---

diff --git a/lib/libcrypto/hidden/openssl/x509.h b/lib/libcrypto/hidden/openssl/x509.h
index d80a3b2576c..29abbc5c0ef 100644
--- a/lib/libcrypto/hidden/openssl/x509.h
+++ b/lib/libcrypto/hidden/openssl/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.7 2024/07/08 17:01:54 beck Exp $ */
+/* $OpenBSD: x509.h,v 1.8 2024/07/15 18:50:42 tb Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -442,15 +442,15 @@ LCRYPTO_USED(X509_ocspid_print);
 LCRYPTO_USED(X509_CRL_print);
 LCRYPTO_USED(X509_REQ_print_ex);
 LCRYPTO_USED(X509_REQ_print);
-LCRYPTO_USED(EVP_PKEY_get_attr_count);
-LCRYPTO_USED(EVP_PKEY_get_attr_by_NID);
-LCRYPTO_USED(EVP_PKEY_get_attr_by_OBJ);
-LCRYPTO_USED(EVP_PKEY_get_attr);
-LCRYPTO_USED(EVP_PKEY_delete_attr);
-LCRYPTO_USED(EVP_PKEY_add1_attr);
-LCRYPTO_USED(EVP_PKEY_add1_attr_by_OBJ);
-LCRYPTO_USED(EVP_PKEY_add1_attr_by_NID);
-LCRYPTO_USED(EVP_PKEY_add1_attr_by_txt);
+LCRYPTO_UNUSED(EVP_PKEY_get_attr_count);
+LCRYPTO_UNUSED(EVP_PKEY_get_attr_by_NID);
+LCRYPTO_UNUSED(EVP_PKEY_get_attr_by_OBJ);
+LCRYPTO_UNUSED(EVP_PKEY_get_attr);
+LCRYPTO_UNUSED(EVP_PKEY_delete_attr);
+LCRYPTO_UNUSED(EVP_PKEY_add1_attr);
+LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_OBJ);
+LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_NID);
+LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_txt);
 LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_new);
 LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_free);
 LCRYPTO_USED(d2i_PKCS8_PRIV_KEY_INFO);