[rt-commit] r235 - in /redwax-tool/branches/redwax-tool-1.1: ./ ChangeLog redwax_p11kit.c

[rt-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sat Sep 19 14:42:35 2026
New Revision: 235

Log:
Backport to v1.1.

Fix header workarounds for p11kit compilation
on Fedora Rawhide.

Modified:
    redwax-tool/branches/redwax-tool-1.1/   (props changed)
    redwax-tool/branches/redwax-tool-1.1/ChangeLog
    redwax-tool/branches/redwax-tool-1.1/redwax_p11kit.c

Propchange: redwax-tool/branches/redwax-tool-1.1/
------------------------------------------------------------------------------
    svn:mergeinfo = /redwax-tool/trunk:233-234

Modified: redwax-tool/branches/redwax-tool-1.1/ChangeLog
==============================================================================
--- redwax-tool/branches/redwax-tool-1.1/ChangeLog	(original)
+++ redwax-tool/branches/redwax-tool-1.1/ChangeLog	Sat Sep 19 14:42:35 2026
@@ -1,3 +1,8 @@
+
+Change with v1.1.1
+
+ *) Fix header workarounds for p11kit compilation
+    on Fedora Rawhide. [Graham Leggett]
 
 Changes with v1.1.0
 

Modified: redwax-tool/branches/redwax-tool-1.1/redwax_p11kit.c
==============================================================================
--- redwax-tool/branches/redwax-tool-1.1/redwax_p11kit.c	(original)
+++ redwax-tool/branches/redwax-tool-1.1/redwax_p11kit.c	Sat Sep 19 14:42:35 2026
@@ -57,9 +57,17 @@
 /* values for CKA_CERTIFICATE_CATEGORY v2.20 */
 #ifndef CK_CERTIFICATE_CATEGORY
 typedef CK_ULONG CK_CERTIFICATE_CATEGORY;
+#endif
+#ifndef CK_CERTIFICATE_CATEGORY_UNSPECIFIED
 #define CK_CERTIFICATE_CATEGORY_UNSPECIFIED 0UL
+#endif
+#ifndef CK_CERTIFICATE_CATEGORY_TOKEN_USER
 #define CK_CERTIFICATE_CATEGORY_TOKEN_USER 1UL
+#endif
+#ifndef CK_CERTIFICATE_CATEGORY_AUTHORITY
 #define CK_CERTIFICATE_CATEGORY_AUTHORITY 2UL
+#endif
+#ifndef CK_CERTIFICATE_CATEGORY_OTHER_ENTITY
 #define CK_CERTIFICATE_CATEGORY_OTHER_ENTITY 3UL
 #endif