1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
|
From: Marc Straube <email@marcstraube.de>
Subject: Fix C23 keyword conflicts with true/false
GCC 15+ treats true/false as C keywords. Rename local variables
to ck_true/ck_false to avoid conflicts.
diff --git a/src/pkcs11/certificateobject.c b/src/pkcs11/certificateobject.c
index ffc8c8e..ffb35b8 100644
--- a/src/pkcs11/certificateobject.c
+++ b/src/pkcs11/certificateobject.c
@@ -540,20 +540,20 @@ int createCertificateObjectFromP15(struct p15CertificateDescription *p15, unsign
{
CK_OBJECT_CLASS class = CKO_CERTIFICATE;
CK_CERTIFICATE_TYPE certType = CKC_X_509;
- CK_BBOOL true = CK_TRUE;
- CK_BBOOL false = CK_FALSE;
+ CK_BBOOL ck_true = CK_TRUE;
+ CK_BBOOL ck_false = CK_FALSE;
CK_ULONG category = 1;
CK_ATTRIBUTE template[] = {
{ CKA_CLASS, &class, sizeof(class) },
{ CKA_CERTIFICATE_TYPE, &certType, sizeof(certType) },
- { CKA_TRUSTED, &ckFalse, sizeof(false) },
+ { CKA_TRUSTED, &ckFalse, sizeof(ck_false) },
{ CKA_CERTIFICATE_CATEGORY, &category, sizeof(category)},
- { CKA_TOKEN, &true, sizeof(true) },
- { CKA_PRIVATE, &false, sizeof(false) },
+ { CKA_TOKEN, &ck_true, sizeof(ck_true) },
+ { CKA_PRIVATE, &ck_false, sizeof(ck_false) },
{ CKA_LABEL, NULL, 0 },
{ CKA_ID, NULL, 0 },
{ CKA_VALUE, NULL, 0 },
- { CKA_MODIFIABLE, &false, sizeof(false) }
+ { CKA_MODIFIABLE, &ck_false, sizeof(ck_false) }
};
struct p11Object_t *p11o;
unsigned char *po;
@@ -597,12 +597,12 @@ int createCertificateObjectFromP15(struct p15CertificateDescription *p15, unsign
}
if (p15->isCA) {
- template[2].pValue = &true;
+ template[2].pValue = &ck_true;
category = 2;
}
if (p15->isModifiable) {
- template[9].pValue = &true;
+ template[9].pValue = &ck_true;
}
p11o = calloc(sizeof(struct p11Object_t), 1);
diff --git a/src/pkcs11/privatekeyobject.c b/src/pkcs11/privatekeyobject.c
index ff0d824..eb78072 100644
--- a/src/pkcs11/privatekeyobject.c
+++ b/src/pkcs11/privatekeyobject.c
@@ -96,26 +96,26 @@ int createPrivateKeyObjectFromP15(struct p15PrivateKeyDescription *p15, struct p
CK_OBJECT_CLASS class = CKO_PRIVATE_KEY;
CK_KEY_TYPE keyType = CKK_RSA;
CK_MECHANISM_TYPE genMechType = CKM_RSA_PKCS_KEY_PAIR_GEN;
- CK_BBOOL true = CK_TRUE;
- CK_BBOOL false = CK_FALSE;
+ CK_BBOOL ck_true = CK_TRUE;
+ CK_BBOOL ck_false = CK_FALSE;
CK_ATTRIBUTE template[] = {
{ CKA_CLASS, &class, sizeof(class) },
{ CKA_KEY_TYPE, &keyType, sizeof(keyType) },
- { CKA_TOKEN, &true, sizeof(true) },
- { CKA_PRIVATE, &true, sizeof(true) },
+ { CKA_TOKEN, &ck_true, sizeof(ck_true) },
+ { CKA_PRIVATE, &ck_true, sizeof(ck_true) },
{ CKA_LABEL, NULL, 0 },
{ CKA_ID, NULL, 0 },
- { CKA_LOCAL, &true, sizeof(true) },
+ { CKA_LOCAL, &ck_true, sizeof(ck_true) },
{ CKA_KEY_GEN_MECHANISM, &genMechType, sizeof(genMechType) },
- { CKA_SENSITIVE, &true, sizeof(true) },
- { CKA_DECRYPT, &true, sizeof(true) },
- { CKA_SIGN, &true, sizeof(true) },
- { CKA_SIGN_RECOVER, &true, sizeof(true) },
- { CKA_ALWAYS_AUTHENTICATE, &false, sizeof(false) },
- { CKA_UNWRAP, &false, sizeof(false) },
- { CKA_EXTRACTABLE, &false, sizeof(false) },
- { CKA_ALWAYS_SENSITIVE, &true, sizeof(true) },
- { CKA_NEVER_EXTRACTABLE, &true, sizeof(true) },
+ { CKA_SENSITIVE, &ck_true, sizeof(ck_true) },
+ { CKA_DECRYPT, &ck_true, sizeof(ck_true) },
+ { CKA_SIGN, &ck_true, sizeof(ck_true) },
+ { CKA_SIGN_RECOVER, &ck_true, sizeof(ck_true) },
+ { CKA_ALWAYS_AUTHENTICATE, &ck_false, sizeof(ck_false) },
+ { CKA_UNWRAP, &ck_false, sizeof(ck_false) },
+ { CKA_EXTRACTABLE, &ck_false, sizeof(ck_false) },
+ { CKA_ALWAYS_SENSITIVE, &ck_true, sizeof(ck_true) },
+ { CKA_NEVER_EXTRACTABLE, &ck_true, sizeof(ck_true) },
{ 0, NULL, 0 },
{ 0, NULL, 0 }
};
@@ -149,10 +149,10 @@ int createPrivateKeyObjectFromP15(struct p15PrivateKeyDescription *p15, struct p
template[5].ulValueLen = (CK_ULONG)p15->id.len;
}
- template[9].pValue = p15->usage & P15_DECIPHER ? &true : &false;
- template[10].pValue = p15->usage & P15_SIGN ? &true : &false;
- template[11].pValue = p15->usage & P15_SIGNRECOVER ? &true : &false;
- template[12].pValue = useAA ? &true : &false;
+ template[9].pValue = p15->usage & P15_DECIPHER ? &ck_true : &ck_false;
+ template[10].pValue = p15->usage & P15_SIGN ? &ck_true : &ck_false;
+ template[11].pValue = p15->usage & P15_SIGNRECOVER ? &ck_true : &ck_false;
+ template[12].pValue = useAA ? &ck_true : &ck_false;
attributes = sizeof(template) / sizeof(CK_ATTRIBUTE) - 2;
@@ -202,27 +202,27 @@ int createPrivateKeyObjectFromP15AndPublicKey(struct p15PrivateKeyDescription *p
CK_OBJECT_CLASS class = CKO_PRIVATE_KEY;
CK_KEY_TYPE keyType = CKK_RSA;
CK_MECHANISM_TYPE genMechType = CKM_RSA_PKCS_KEY_PAIR_GEN;
- CK_BBOOL true = CK_TRUE;
- CK_BBOOL false = CK_FALSE;
+ CK_BBOOL ck_true = CK_TRUE;
+ CK_BBOOL ck_false = CK_FALSE;
struct p11Attribute_t *pattr;
CK_ATTRIBUTE template[] = {
{ CKA_CLASS, &class, sizeof(class) },
{ CKA_KEY_TYPE, &keyType, sizeof(keyType) },
- { CKA_TOKEN, &true, sizeof(true) },
- { CKA_PRIVATE, &true, sizeof(true) },
+ { CKA_TOKEN, &ck_true, sizeof(ck_true) },
+ { CKA_PRIVATE, &ck_true, sizeof(ck_true) },
{ CKA_LABEL, NULL, 0 },
{ CKA_ID, NULL, 0 },
- { CKA_LOCAL, &true, sizeof(true) },
+ { CKA_LOCAL, &ck_true, sizeof(ck_true) },
{ CKA_KEY_GEN_MECHANISM, &genMechType, sizeof(genMechType) },
- { CKA_SENSITIVE, &true, sizeof(true) },
- { CKA_DECRYPT, &true, sizeof(true) },
- { CKA_SIGN, &true, sizeof(true) },
- { CKA_SIGN_RECOVER, &true, sizeof(true) },
- { CKA_ALWAYS_AUTHENTICATE, &false, sizeof(false) },
- { CKA_UNWRAP, &false, sizeof(false) },
- { CKA_EXTRACTABLE, &false, sizeof(false) },
- { CKA_ALWAYS_SENSITIVE, &true, sizeof(true) },
- { CKA_NEVER_EXTRACTABLE, &true, sizeof(true) },
+ { CKA_SENSITIVE, &ck_true, sizeof(ck_true) },
+ { CKA_DECRYPT, &ck_true, sizeof(ck_true) },
+ { CKA_SIGN, &ck_true, sizeof(ck_true) },
+ { CKA_SIGN_RECOVER, &ck_true, sizeof(ck_true) },
+ { CKA_ALWAYS_AUTHENTICATE, &ck_false, sizeof(ck_false) },
+ { CKA_UNWRAP, &ck_false, sizeof(ck_false) },
+ { CKA_EXTRACTABLE, &ck_false, sizeof(ck_false) },
+ { CKA_ALWAYS_SENSITIVE, &ck_true, sizeof(ck_true) },
+ { CKA_NEVER_EXTRACTABLE, &ck_true, sizeof(ck_true) },
{ 0, NULL, 0 },
{ 0, NULL, 0 }
};
@@ -247,10 +247,10 @@ int createPrivateKeyObjectFromP15AndPublicKey(struct p15PrivateKeyDescription *p
template[5].ulValueLen = (CK_ULONG)p15->id.len;
}
- template[9].pValue = p15->usage & P15_DECIPHER ? &true : &false;
- template[10].pValue = p15->usage & P15_SIGN ? &true : &false;
- template[11].pValue = p15->usage & P15_SIGNRECOVER ? &true : &false;
- template[12].pValue = useAA ? &true : &false;
+ template[9].pValue = p15->usage & P15_DECIPHER ? &ck_true : &ck_false;
+ template[10].pValue = p15->usage & P15_SIGN ? &ck_true : &ck_false;
+ template[11].pValue = p15->usage & P15_SIGNRECOVER ? &ck_true : &ck_false;
+ template[12].pValue = useAA ? &ck_true : &ck_false;
attributes = sizeof(template) / sizeof(CK_ATTRIBUTE) - 2;
diff --git a/src/pkcs11/publickeyobject.c b/src/pkcs11/publickeyobject.c
index a128059..cb78c7e 100644
--- a/src/pkcs11/publickeyobject.c
+++ b/src/pkcs11/publickeyobject.c
@@ -106,22 +106,22 @@ int createPublicKeyObjectFromCertificate(struct p15PrivateKeyDescription *p15, s
CK_OBJECT_CLASS class = CKO_PUBLIC_KEY;
CK_KEY_TYPE keyType = CKK_RSA;
CK_UTF8CHAR label[10];
- CK_BBOOL true = CK_TRUE;
- CK_BBOOL false = CK_FALSE;
+ CK_BBOOL ck_true = CK_TRUE;
+ CK_BBOOL ck_false = CK_FALSE;
CK_ULONG modulus_bits = 2048;
CK_ATTRIBUTE template[] = {
{ CKA_CLASS, &class, sizeof(class) },
{ CKA_KEY_TYPE, &keyType, sizeof(keyType) },
- { CKA_TOKEN, &true, sizeof(true) },
- { CKA_PRIVATE, &false, sizeof(false) },
+ { CKA_TOKEN, &ck_true, sizeof(ck_true) },
+ { CKA_PRIVATE, &ck_false, sizeof(ck_false) },
{ CKA_LABEL, label, sizeof(label) - 1 },
{ CKA_ID, NULL, 0 },
- { CKA_LOCAL, &true, sizeof(true) },
- { CKA_ENCRYPT, &true, sizeof(true) },
- { CKA_VERIFY, &true, sizeof(true) },
- { CKA_VERIFY_RECOVER, &true, sizeof(true) },
- { CKA_WRAP, &false, sizeof(false) },
- { CKA_TRUSTED, &false, sizeof(false) },
+ { CKA_LOCAL, &ck_true, sizeof(ck_true) },
+ { CKA_ENCRYPT, &ck_true, sizeof(ck_true) },
+ { CKA_VERIFY, &ck_true, sizeof(ck_true) },
+ { CKA_VERIFY_RECOVER, &ck_true, sizeof(ck_true) },
+ { CKA_WRAP, &ck_false, sizeof(ck_false) },
+ { CKA_TRUSTED, &ck_false, sizeof(ck_false) },
{ 0, NULL, 0 },
{ 0, NULL, 0 },
{ 0, NULL, 0 }
@@ -213,22 +213,22 @@ int createPublicKeyObjectFromCVC(struct p15PrivateKeyDescription *p15, unsigned
{
CK_OBJECT_CLASS class = CKO_PUBLIC_KEY;
CK_KEY_TYPE keyType = CKK_RSA;
- CK_BBOOL true = CK_TRUE;
- CK_BBOOL false = CK_FALSE;
+ CK_BBOOL ck_true = CK_TRUE;
+ CK_BBOOL ck_false = CK_FALSE;
CK_ULONG modulus_bits;
CK_ATTRIBUTE template[] = {
{ CKA_CLASS, &class, sizeof(class) },
{ CKA_KEY_TYPE, &keyType, sizeof(keyType) },
- { CKA_TOKEN, &true, sizeof(true) },
- { CKA_PRIVATE, &false, sizeof(false) },
+ { CKA_TOKEN, &ck_true, sizeof(ck_true) },
+ { CKA_PRIVATE, &ck_false, sizeof(ck_false) },
{ CKA_LABEL, NULL, 0 },
{ CKA_ID, NULL, 0 },
- { CKA_LOCAL, &true, sizeof(true) },
- { CKA_ENCRYPT, &true, sizeof(true) },
- { CKA_VERIFY, &true, sizeof(true) },
- { CKA_VERIFY_RECOVER, &true, sizeof(true) },
- { CKA_WRAP, &false, sizeof(false) },
- { CKA_TRUSTED, &false, sizeof(false) },
+ { CKA_LOCAL, &ck_true, sizeof(ck_true) },
+ { CKA_ENCRYPT, &ck_true, sizeof(ck_true) },
+ { CKA_VERIFY, &ck_true, sizeof(ck_true) },
+ { CKA_VERIFY_RECOVER, &ck_true, sizeof(ck_true) },
+ { CKA_WRAP, &ck_false, sizeof(ck_false) },
+ { CKA_TRUSTED, &ck_false, sizeof(ck_false) },
{ CKA_CVC_REQUEST, NULL, 0 },
{ 0, NULL, 0 },
{ 0, NULL, 0 },
diff --git a/src/pkcs11/secretkeyobject.c b/src/pkcs11/secretkeyobject.c
index 2892e68..6cb0757 100644
--- a/src/pkcs11/secretkeyobject.c
+++ b/src/pkcs11/secretkeyobject.c
@@ -95,29 +95,29 @@ int createSecretKeyObjectFromP15(struct p15SecretKeyDescription *p15, struct p11
CK_KEY_TYPE keyType = CKK_AES;
CK_MECHANISM_TYPE genMechType = CKM_AES_KEY_GEN;
CK_ULONG keylen = 0;
- CK_BBOOL true = CK_TRUE;
- CK_BBOOL false = CK_FALSE;
+ CK_BBOOL ck_true = CK_TRUE;
+ CK_BBOOL ck_false = CK_FALSE;
CK_ATTRIBUTE template[] = {
{ CKA_CLASS, &class, sizeof(class) },
{ CKA_KEY_TYPE, &keyType, sizeof(keyType) },
- { CKA_TOKEN, &true, sizeof(true) },
- { CKA_PRIVATE, &true, sizeof(true) },
+ { CKA_TOKEN, &ck_true, sizeof(ck_true) },
+ { CKA_PRIVATE, &ck_true, sizeof(ck_true) },
{ CKA_LABEL, NULL, 0 },
{ CKA_ID, NULL, 0 },
- { CKA_LOCAL, &true, sizeof(true) },
+ { CKA_LOCAL, &ck_true, sizeof(ck_true) },
{ CKA_KEY_GEN_MECHANISM, &genMechType, sizeof(genMechType) },
{ CKA_VALUE_LEN, &keylen, sizeof(keylen) },
- { CKA_SENSITIVE, &true, sizeof(true) },
- { CKA_ENCRYPT, &true, sizeof(true) },
- { CKA_DECRYPT, &true, sizeof(true) },
- { CKA_SIGN, &true, sizeof(true) },
- { CKA_VERIFY, &true, sizeof(true) },
- { CKA_WRAP, &false, sizeof(false) },
- { CKA_UNWRAP, &false, sizeof(false) },
- { CKA_DERIVE, &false, sizeof(false) },
- { CKA_EXTRACTABLE, &false, sizeof(false) },
- { CKA_ALWAYS_SENSITIVE, &true, sizeof(true) },
- { CKA_NEVER_EXTRACTABLE, &true, sizeof(true) }
+ { CKA_SENSITIVE, &ck_true, sizeof(ck_true) },
+ { CKA_ENCRYPT, &ck_true, sizeof(ck_true) },
+ { CKA_DECRYPT, &ck_true, sizeof(ck_true) },
+ { CKA_SIGN, &ck_true, sizeof(ck_true) },
+ { CKA_VERIFY, &ck_true, sizeof(ck_true) },
+ { CKA_WRAP, &ck_false, sizeof(ck_false) },
+ { CKA_UNWRAP, &ck_false, sizeof(ck_false) },
+ { CKA_DERIVE, &ck_false, sizeof(ck_false) },
+ { CKA_EXTRACTABLE, &ck_false, sizeof(ck_false) },
+ { CKA_ALWAYS_SENSITIVE, &ck_true, sizeof(ck_true) },
+ { CKA_NEVER_EXTRACTABLE, &ck_true, sizeof(ck_true) }
};
struct p11Object_t *p11o;
int rc, attributes;
@@ -142,13 +142,13 @@ int createSecretKeyObjectFromP15(struct p15SecretKeyDescription *p15, struct p11
keylen = p15->keysize >> 3;
- template[10].pValue = p15->usage & P15_ENCIPHER ? &true : &false;
- template[11].pValue = p15->usage & P15_DECIPHER ? &true : &false;
- template[12].pValue = p15->usage & P15_SIGN ? &true : &false;
- template[13].pValue = p15->usage & P15_VERIFY ? &true : &false;
- template[14].pValue = p15->usage & P15_KEYENCIPHER ? &true : &false;
- template[15].pValue = p15->usage & P15_KEYDECIPHER ? &true : &false;
- template[16].pValue = p15->usage & P15_DERIVE ? &true : &false;
+ template[10].pValue = p15->usage & P15_ENCIPHER ? &ck_true : &ck_false;
+ template[11].pValue = p15->usage & P15_DECIPHER ? &ck_true : &ck_false;
+ template[12].pValue = p15->usage & P15_SIGN ? &ck_true : &ck_false;
+ template[13].pValue = p15->usage & P15_VERIFY ? &ck_true : &ck_false;
+ template[14].pValue = p15->usage & P15_KEYENCIPHER ? &ck_true : &ck_false;
+ template[15].pValue = p15->usage & P15_KEYDECIPHER ? &ck_true : &ck_false;
+ template[16].pValue = p15->usage & P15_DERIVE ? &ck_true : &ck_false;
attributes = sizeof(template) / sizeof(CK_ATTRIBUTE);
|