File 0012-common-pkcs11x.h-Support-CRYPTOKI_GNU-for-IBM-vendor.patch of Package p11-kit.31290

From bd1574181b9a736ab6445d581388fc1162f3474a Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Sun, 19 Jun 2022 16:29:41 +0900
Subject: [PATCH] common/pkcs11x.h: Support CRYPTOKI_GNU for IBM vendor
 mechanisms

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---
 common/pkcs11x.h | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/pkcs11x.h b/common/pkcs11x.h
index 4183b3d..da29224 100644
--- a/common/pkcs11x.h
+++ b/common/pkcs11x.h
@@ -226,9 +226,23 @@ typedef CK_ULONG                        CK_TRUST;
 #define CKM_IBM_SHA3_512_HMAC                  (CKM_VENDOR_DEFINED + 0x10028)
 #define CKM_IBM_ATTRIBUTEBOUND_WRAP            (CKM_VENDOR_DEFINED + 0x20004)
 
-typedef struct CK_IBM_ATTRIBUTEBOUND_WRAP {
-      CK_OBJECT_HANDLE hSignVerifyKey;
-} CK_IBM_ATTRIBUTEBOUND_WRAP_PARAMS;
+/*
+ * If the caller is using the PKCS#11 GNU calling convention, then we cater
+ * to that here.
+ */
+#ifdef CRYPTOKI_GNU
+#define hSignVerifyKey h_sign_verify_key
+#endif
+
+struct ck_ibm_attributebound_wrap {
+	CK_OBJECT_HANDLE hSignVerifyKey;
+};
+
+typedef struct ck_ibm_attributebound_wrap CK_IBM_ATTRIBUTEBOUND_WRAP_PARAMS;
+
+#ifdef CRYPTOKI_GNU
+#undef hSignVerifyKey
+#endif
 
 #endif /* CRYPTOKI_IBM_VENDOR_DEFINED */
 
-- 
2.38.1