Skip to content

Commit 2318465

Browse files
dgarskedgarske
committed
Minor cleanups for building with C++. Cast warnings, use of "private" and spelling. Added ignores for generated test files.
1 parent 86610c2 commit 2318465

7 files changed

Lines changed: 57 additions & 48 deletions

File tree

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,9 @@ test/*
3737
*.gcda
3838
*.gcno
3939

40+
tests/wp11_rsakey_*
41+
tests/wp11_dhkey_*
42+
tests/wp11_ecckey_*
43+
tests/wp11_symmkey_*
44+
tests/wp11_token_*
45+
tests/wp11_obj_*

‎src/crypto.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ static CK_RV SetAttributeValue(WP11_Session* session, WP11_Object* obj,
319319
for (i = 0; i < cnt; i++) {
320320
for (j = 0; j < (int)ulCount; j++) {
321321
if (attrs[i] == pTemplate[j].type) {
322-
data[i] = pTemplate[j].pValue;
322+
data[i] = (unsigned char*)pTemplate[j].pValue;
323323
if (data[i] == NULL)
324324
return CKR_ATTRIBUTE_VALUE_INVALID;
325325
len[i] = (int)pTemplate[j].ulValueLen;
@@ -364,7 +364,7 @@ static CK_RV SetAttributeValue(WP11_Session* session, WP11_Object* obj,
364364
/* Set remaining attributes - key specific attributes ignored. */
365365
for (i = 0; i < (int)ulCount; i++) {
366366
attr = &pTemplate[i];
367-
ret = WP11_Object_SetAttr(obj, attr->type, attr->pValue,
367+
ret = WP11_Object_SetAttr(obj, attr->type, (byte*)attr->pValue,
368368
attr->ulValueLen);
369369
if (ret == BAD_FUNC_ARG)
370370
return CKR_ATTRIBUTE_VALUE_INVALID;
@@ -770,7 +770,7 @@ CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession,
770770
for (i = 0; i < (int)ulCount; i++) {
771771
attr = &pTemplate[i];
772772

773-
ret = WP11_Object_GetAttr(obj, attr->type, attr->pValue,
773+
ret = WP11_Object_GetAttr(obj, attr->type, (byte*)attr->pValue,
774774
&attr->ulValueLen);
775775
if (ret == BAD_FUNC_ARG)
776776
return CKR_ATTRIBUTE_TYPE_INVALID;
@@ -789,7 +789,7 @@ CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession,
789789
* Set the values of the attributes into the object.
790790
*
791791
* @param hSession [in] Handle of session.
792-
* @param hObject [in] Handle of object to set value agqainst.
792+
* @param hObject [in] Handle of object to set value against.
793793
* @param pTemplate [in] Template of attributes set against object.
794794
* @param ulCount [in] Number of attribute triplets in template.
795795
* @return CKR_CRYPTOKI_NOT_INITIALIZED when library not initialized.
@@ -1020,8 +1020,8 @@ CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession,
10201020
return CKR_MECHANISM_PARAM_INVALID;
10211021

10221022
ret = WP11_Session_SetOaepParams(session, params->hashAlg,
1023-
params->mgf, params->pSourceData,
1024-
(int)params->ulSourceDataLen);
1023+
params->mgf, (byte*)params->pSourceData,
1024+
(int)params->ulSourceDataLen);
10251025
if (ret != 0)
10261026
return CKR_MECHANISM_PARAM_INVALID;
10271027
init = WP11_INIT_RSA_PKCS_OAEP_ENC;
@@ -1039,8 +1039,8 @@ CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession,
10391039
return CKR_MECHANISM_PARAM_INVALID;
10401040
if (pMechanism->ulParameterLen != AES_IV_SIZE)
10411041
return CKR_MECHANISM_PARAM_INVALID;
1042-
ret = WP11_Session_SetCbcParams(session, pMechanism->pParameter, 1,
1043-
obj);
1042+
ret = WP11_Session_SetCbcParams(session,
1043+
(unsigned char*)pMechanism->pParameter, 1, obj);
10441044
if (ret == MEMORY_E)
10451045
return CKR_DEVICE_MEMORY;
10461046
if (ret != 0)
@@ -1055,8 +1055,8 @@ CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession,
10551055
return CKR_MECHANISM_PARAM_INVALID;
10561056
if (pMechanism->ulParameterLen != AES_IV_SIZE)
10571057
return CKR_MECHANISM_PARAM_INVALID;
1058-
ret = WP11_Session_SetCbcParams(session, pMechanism->pParameter, 1,
1059-
obj);
1058+
ret = WP11_Session_SetCbcParams(session,
1059+
(unsigned char*)pMechanism->pParameter, 1, obj);
10601060
if (ret == MEMORY_E)
10611061
return CKR_DEVICE_MEMORY;
10621062
if (ret != 0)
@@ -1593,8 +1593,8 @@ CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession,
15931593
return CKR_MECHANISM_PARAM_INVALID;
15941594

15951595
ret = WP11_Session_SetOaepParams(session, params->hashAlg,
1596-
params->mgf, params->pSourceData,
1597-
(int)params->ulSourceDataLen);
1596+
params->mgf, (byte*)params->pSourceData,
1597+
(int)params->ulSourceDataLen);
15981598
if (ret != 0)
15991599
return CKR_MECHANISM_PARAM_INVALID;
16001600
init = WP11_INIT_RSA_PKCS_OAEP_DEC;
@@ -1611,8 +1611,8 @@ CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession,
16111611
return CKR_MECHANISM_PARAM_INVALID;
16121612
if (pMechanism->ulParameterLen != AES_IV_SIZE)
16131613
return CKR_MECHANISM_PARAM_INVALID;
1614-
ret = WP11_Session_SetCbcParams(session, pMechanism->pParameter, 0,
1615-
obj);
1614+
ret = WP11_Session_SetCbcParams(session,
1615+
(unsigned char*)pMechanism->pParameter, 0, obj);
16161616
if (ret == MEMORY_E)
16171617
return CKR_DEVICE_MEMORY;
16181618
if (ret != 0)
@@ -1626,8 +1626,8 @@ CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession,
16261626
return CKR_MECHANISM_PARAM_INVALID;
16271627
if (pMechanism->ulParameterLen != AES_IV_SIZE)
16281628
return CKR_MECHANISM_PARAM_INVALID;
1629-
ret = WP11_Session_SetCbcParams(session, pMechanism->pParameter, 0,
1630-
obj);
1629+
ret = WP11_Session_SetCbcParams(session,
1630+
(unsigned char*)pMechanism->pParameter, 0, obj);
16311631
if (ret == MEMORY_E)
16321632
return CKR_DEVICE_MEMORY;
16331633
if (ret != 0)
@@ -3846,7 +3846,7 @@ CK_RV C_DeriveKey(CK_SESSION_HANDLE hSession,
38463846
return CKR_MECHANISM_PARAM_INVALID;
38473847

38483848
keyLen = (word32)(params->ulPublicDataLen / 2);
3849-
derivedKey = XMALLOC(keyLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
3849+
derivedKey = (byte*)XMALLOC(keyLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
38503850
if (derivedKey == NULL)
38513851
return CKR_DEVICE_MEMORY;
38523852

@@ -3866,11 +3866,11 @@ CK_RV C_DeriveKey(CK_SESSION_HANDLE hSession,
38663866
return CKR_MECHANISM_PARAM_INVALID;
38673867

38683868
keyLen = (word32)pMechanism->ulParameterLen;
3869-
derivedKey = XMALLOC(keyLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
3869+
derivedKey = (byte*)XMALLOC(keyLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
38703870
if (derivedKey == NULL)
38713871
return CKR_DEVICE_MEMORY;
38723872

3873-
ret = WP11_Dh_Derive(pMechanism->pParameter,
3873+
ret = WP11_Dh_Derive((unsigned char*)pMechanism->pParameter,
38743874
(int)pMechanism->ulParameterLen, derivedKey,
38753875
&keyLen, obj);
38763876
if (ret != 0)

‎src/internal.c‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ static int wp11_Session_New(WP11_Slot* slot, CK_OBJECT_HANDLE handle,
486486
int ret = 0;
487487
WP11_Session* sess;
488488

489-
sess = XMALLOC(sizeof(*sess), NULL, DYNAMIC_TYPE_TMP_BUFFER);
489+
sess = (WP11_Session*)XMALLOC(sizeof(*sess), NULL, DYNAMIC_TYPE_TMP_BUFFER);
490490
if (sess == NULL)
491491
ret = MEMORY_E;
492492

@@ -1171,7 +1171,7 @@ static int wp11_storage_read_alloc_array(void* storage,
11711171
ret = wp11_storage_read_int(storage, len);
11721172
if (ret == 0) {
11731173
/* Allocate buffer to hold data. */
1174-
*buffer = XMALLOC(*len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1174+
*buffer = (unsigned char*)XMALLOC(*len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
11751175
if (*buffer == NULL)
11761176
ret = MEMORY_E;
11771177
}
@@ -1231,7 +1231,7 @@ static int wp11_Object_New(WP11_Slot* slot, CK_KEY_TYPE type,
12311231
int ret = 0;
12321232
WP11_Object* obj = NULL;
12331233

1234-
obj = XMALLOC(sizeof(*obj), NULL, DYNAMIC_TYPE_TMP_BUFFER);
1234+
obj = (WP11_Object*)XMALLOC(sizeof(*obj), NULL, DYNAMIC_TYPE_TMP_BUFFER);
12351235
if (obj == NULL)
12361236
ret = MEMORY_E;
12371237

@@ -1411,7 +1411,7 @@ static int wp11_Object_Encode_RsaKey(WP11_Object* object)
14111411
if (ret == 0) {
14121412
XFREE(object->keyData, NULL, DYNAMIC_TYPE_TMP_BUFFER);
14131413
/* Allocate buffer to hold encoded key. */
1414-
object->keyData = XMALLOC(object->keyDataLen, NULL,
1414+
object->keyData = (unsigned char*)XMALLOC(object->keyDataLen, NULL,
14151415
DYNAMIC_TYPE_TMP_BUFFER);
14161416
if (object->keyData == NULL)
14171417
ret = MEMORY_E;
@@ -1602,7 +1602,7 @@ static int wp11_Object_Encode_EccKey(WP11_Object* object)
16021602
if (ret == 0) {
16031603
XFREE(object->keyData, NULL, DYNAMIC_TYPE_TMP_BUFFER);
16041604
/* Allocate buffer to hold encoded key. */
1605-
object->keyData = XMALLOC(object->keyDataLen, NULL,
1605+
object->keyData = (unsigned char*)XMALLOC(object->keyDataLen, NULL,
16061606
DYNAMIC_TYPE_TMP_BUFFER);
16071607
if (object->keyData == NULL)
16081608
ret = MEMORY_E;
@@ -1762,7 +1762,7 @@ static int wp11_Object_Encode_DhKey(WP11_Object* object)
17621762
object->keyDataLen = object->data.dhKey.len + AES_BLOCK_SIZE;
17631763
XFREE(object->keyData, NULL, DYNAMIC_TYPE_TMP_BUFFER);
17641764
/* Allocate buffer to hold encoded key. */
1765-
object->keyData = XMALLOC(object->keyDataLen, NULL,
1765+
object->keyData = (unsigned char*)XMALLOC(object->keyDataLen, NULL,
17661766
DYNAMIC_TYPE_TMP_BUFFER);
17671767
if (object->keyData == NULL)
17681768
ret = MEMORY_E;
@@ -2021,7 +2021,7 @@ static int wp11_Object_Store_DhKey(WP11_Object* object, int tokenId, int objId)
20212021
}
20222022
if (ret == 0) {
20232023
/* Allocate buffer to hold encoded key. */
2024-
der = XMALLOC(len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
2024+
der = (unsigned char*)XMALLOC(len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
20252025
if (der == NULL)
20262026
ret = MEMORY_E;
20272027
}
@@ -2084,7 +2084,7 @@ static int wp11_Object_Encode_SymmKey(WP11_Object* object)
20842084
object->keyDataLen = object->data.symmKey.len + AES_BLOCK_SIZE;
20852085
XFREE(object->keyData, NULL, DYNAMIC_TYPE_TMP_BUFFER);
20862086
/* Allocate buffer to hold encoded key. */
2087-
object->keyData = XMALLOC(object->keyDataLen, NULL,
2087+
object->keyData = (unsigned char*)XMALLOC(object->keyDataLen, NULL,
20882088
DYNAMIC_TYPE_TMP_BUFFER);
20892089
if (object->keyData == NULL)
20902090
ret = MEMORY_E;
@@ -3849,7 +3849,7 @@ WP11_Slot* WP11_Session_GetSlot(WP11_Session* session)
38493849
}
38503850

38513851
/**
3852-
* Get the mechansim associated with the session.
3852+
* Get the mechanism associated with the session.
38533853
*
38543854
* @param session [in] Session object.
38553855
* @return Mechanism of the session.
@@ -3976,7 +3976,7 @@ int WP11_Session_SetOaepParams(WP11_Session* session, CK_MECHANISM_TYPE hashAlg,
39763976
oaep->labelSz = 0;
39773977
}
39783978
if (ret == 0 && label != NULL) {
3979-
oaep->label = XMALLOC(labelSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
3979+
oaep->label = (byte*)XMALLOC(labelSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
39803980
if (oaep->label == NULL)
39813981
ret = MEMORY_E;
39823982
else {
@@ -4086,7 +4086,8 @@ int WP11_Session_SetGcmParams(WP11_Session* session, unsigned char* iv,
40864086
gcm->ivSz = ivSz;
40874087
gcm->tagBits = tagBits;
40884088
if (aad != NULL) {
4089-
gcm->aad = XMALLOC(aadLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
4089+
gcm->aad = (unsigned char*)XMALLOC(aadLen, NULL,
4090+
DYNAMIC_TYPE_TMP_BUFFER);
40904091
if (gcm->aad == NULL)
40914092
ret = MEMORY_E;
40924093
if (ret == 0) {
@@ -4356,7 +4357,7 @@ void WP11_Session_Find(WP11_Session* session, int onToken,
43564357
while ((obj = wp11_Session_FindNext(session, onToken, obj)) != NULL) {
43574358
for (i = 0; i < (int)ulCount; i++) {
43584359
attr = &pTemplate[i];
4359-
if (!WP11_Object_MatchAttr(obj, attr->type, attr->pValue,
4360+
if (!WP11_Object_MatchAttr(obj, attr->type, (byte*)attr->pValue,
43604361
attr->ulValueLen)) {
43614362
break;
43624363
}
@@ -5492,7 +5493,8 @@ static int WP11_Object_SetKeyId(WP11_Object* object, unsigned char* keyId,
54925493

54935494
if (object->keyId != NULL)
54945495
XFREE(object->keyId, NULL, DYNAMIC_TYPE_TMP_BUFFER);
5495-
object->keyId = XMALLOC(keyIdLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
5496+
object->keyId = (unsigned char*)XMALLOC(keyIdLen, NULL,
5497+
DYNAMIC_TYPE_TMP_BUFFER);
54965498
if (object->keyId == NULL)
54975499
ret = MEMORY_E;
54985500
if (ret == 0) {
@@ -5519,7 +5521,8 @@ static int WP11_Object_SetLabel(WP11_Object* object, unsigned char* label,
55195521

55205522
if (object->label != NULL)
55215523
XFREE(object->label, NULL, DYNAMIC_TYPE_TMP_BUFFER);
5522-
object->label = XMALLOC(labelLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
5524+
object->label = (unsigned char*)XMALLOC(labelLen, NULL,
5525+
DYNAMIC_TYPE_TMP_BUFFER);
55235526
if (object->label == NULL)
55245527
ret = MEMORY_E;
55255528
if (ret == 0) {
@@ -5786,7 +5789,7 @@ int WP11_Object_MatchAttr(WP11_Object* object, CK_ATTRIBUTE_TYPE type,
57865789
}
57875790
else {
57885791
/* Allocate a buffer to hold data and then compare. */
5789-
ptr = XMALLOC(len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
5792+
ptr = (byte*)XMALLOC(len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
57905793
if (ptr != NULL) {
57915794
if (WP11_Object_GetAttr(object, type, ptr, &attrLen) == 0)
57925795
ret = (attrLen == len) && (XMEMCMP(ptr, data, len) == 0);
@@ -7534,7 +7537,7 @@ int WP11_AesGcm_DecryptUpdate(unsigned char* enc, word32 encSz,
75347537
unsigned char* newEnc;
75357538
WP11_GcmParams* gcm = &session->params.gcm;
75367539

7537-
newEnc = XREALLOC(gcm->enc, gcm->encSz + encSz, NULL,
7540+
newEnc = (unsigned char*)XREALLOC(gcm->enc, gcm->encSz + encSz, NULL,
75387541
DYNAMIC_TYPE_TMP_BUFFER);
75397542
if (newEnc == NULL)
75407543
ret = MEMORY_E;

‎src/slot.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static CK_TOKEN_INFO tokenInfoTemplate = {
105105
"",
106106
"wolfpkcs11",
107107
"wolfpkcs11",
108-
"0000000000000000",
108+
"0000000000000000", /* serialNumber */
109109
CKF_RNG | CKF_CLOCK_ON_TOKEN | CKF_LOGIN_REQUIRED,
110110
WP11_SESSION_CNT_MAX, /* ulMaxSessionCount */
111111
CK_UNAVAILABLE_INFORMATION, /* ulSessionCount */

‎tests/pkcs11mtt.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -647,13 +647,13 @@ static CK_RV test_attribute_types(void* args)
647647
{ CKA_VALUE, keyData, sizeof(keyData) },
648648
};
649649
CK_ULONG tmplCnt = sizeof(tmpl) / sizeof(*tmpl);
650-
CK_BBOOL private, sensitive, extractable, modifiable, alwaysSensitive;
650+
CK_BBOOL privateBool, sensitive, extractable, modifiable, alwaysSensitive;
651651
CK_BBOOL neverExtractable, alwaysAuthenticate, copyable, destroyable, local;
652652
CK_BBOOL wrapWithTrusted, trusted;
653653
CK_BBOOL encrypt, decrypt, verify, verifyRecover, sign, signRecover;
654654
CK_BBOOL wrap, unwrap, derive;
655655
CK_ATTRIBUTE boolTmpl[] = {
656-
{ CKA_PRIVATE, &private, sizeof(CK_BBOOL) },
656+
{ CKA_PRIVATE, &privateBool, sizeof(CK_BBOOL) },
657657
{ CKA_SENSITIVE, &sensitive, sizeof(CK_BBOOL) },
658658
{ CKA_EXTRACTABLE, &extractable, sizeof(CK_BBOOL) },
659659
{ CKA_MODIFIABLE, &modifiable, sizeof(CK_BBOOL) },
@@ -677,7 +677,7 @@ static CK_RV test_attribute_types(void* args)
677677
};
678678
CK_ULONG boolTmplCnt = sizeof(boolTmpl) / sizeof(*boolTmpl);
679679
CK_ATTRIBUTE boolSetTmpl[] = {
680-
{ CKA_PRIVATE, &private, sizeof(CK_BBOOL) },
680+
{ CKA_PRIVATE, &privateBool, sizeof(CK_BBOOL) },
681681
{ CKA_SENSITIVE, &sensitive, sizeof(CK_BBOOL) },
682682
{ CKA_EXTRACTABLE, &extractable, sizeof(CK_BBOOL) },
683683
{ CKA_MODIFIABLE, &modifiable, sizeof(CK_BBOOL) },
@@ -6437,7 +6437,7 @@ static CK_RV pkcs11_init(const char* library)
64376437
}
64386438

64396439
if (ret == CKR_OK) {
6440-
func = (CK_C_GetFunctionList)dlsym(dlib, "C_GetFunctionList");
6440+
func = (void*)(CK_C_GetFunctionList)dlsym(dlib, "C_GetFunctionList");
64416441
if (func == NULL) {
64426442
fprintf(stderr, "Failed to get function list function\n");
64436443
ret = -1;

‎tests/pkcs11str.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ static CK_RV pkcs11_init(const char* library)
849849
}
850850

851851
if (ret == CKR_OK) {
852-
func = (CK_C_GetFunctionList)dlsym(dlib, "C_GetFunctionList");
852+
func = (void*)(CK_C_GetFunctionList)dlsym(dlib, "C_GetFunctionList");
853853
if (func == NULL) {
854854
fprintf(stderr, "Failed to get function list function\n");
855855
ret = -1;

‎tests/pkcs11test.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ static CK_RV test_slot(void* args)
476476
CHECK_CKR(ret, "Get Slot List count");
477477
}
478478
if (ret == CKR_OK) {
479-
slotList = XMALLOC(count * sizeof(CK_SLOT_ID), NULL,
479+
slotList = (CK_SLOT_ID*)XMALLOC(count * sizeof(CK_SLOT_ID), NULL,
480480
DYNAMIC_TYPE_TMP_BUFFER);
481481
if (slotList == NULL)
482482
ret = CKR_DEVICE_MEMORY;
@@ -525,8 +525,8 @@ static CK_RV test_slot(void* args)
525525
CHECK_CKR(ret, "Get Mechanism List count");
526526
}
527527
if (ret == CKR_OK) {
528-
list = XMALLOC(count * sizeof(CK_MECHANISM_TYPE), NULL,
529-
DYNAMIC_TYPE_TMP_BUFFER);
528+
list = (CK_MECHANISM_TYPE*)XMALLOC(count * sizeof(CK_MECHANISM_TYPE),
529+
NULL, DYNAMIC_TYPE_TMP_BUFFER);
530530
if (list == NULL)
531531
ret = CKR_DEVICE_MEMORY;
532532
CHECK_CKR(ret, "Allocate mechanism list memory");
@@ -1489,13 +1489,13 @@ static CK_RV test_attribute_types(void* args)
14891489
{ CKA_VALUE, keyData, sizeof(keyData) },
14901490
};
14911491
CK_ULONG tmplCnt = sizeof(tmpl) / sizeof(*tmpl);
1492-
CK_BBOOL private, sensitive, extractable, modifiable, alwaysSensitive;
1492+
CK_BBOOL privateBool, sensitive, extractable, modifiable, alwaysSensitive;
14931493
CK_BBOOL neverExtractable, alwaysAuthenticate, copyable, destroyable, local;
14941494
CK_BBOOL wrapWithTrusted, trusted;
14951495
CK_BBOOL encrypt, decrypt, verify, verifyRecover, sign, signRecover;
14961496
CK_BBOOL wrap, unwrap, derive;
14971497
CK_ATTRIBUTE boolTmpl[] = {
1498-
{ CKA_PRIVATE, &private, sizeof(CK_BBOOL) },
1498+
{ CKA_PRIVATE, &privateBool, sizeof(CK_BBOOL) },
14991499
{ CKA_SENSITIVE, &sensitive, sizeof(CK_BBOOL) },
15001500
{ CKA_EXTRACTABLE, &extractable, sizeof(CK_BBOOL) },
15011501
{ CKA_MODIFIABLE, &modifiable, sizeof(CK_BBOOL) },
@@ -1519,7 +1519,7 @@ static CK_RV test_attribute_types(void* args)
15191519
};
15201520
CK_ULONG boolTmplCnt = sizeof(boolTmpl) / sizeof(*boolTmpl);
15211521
CK_ATTRIBUTE boolSetTmpl[] = {
1522-
{ CKA_PRIVATE, &private, sizeof(CK_BBOOL) },
1522+
{ CKA_PRIVATE, &privateBool, sizeof(CK_BBOOL) },
15231523
{ CKA_SENSITIVE, &sensitive, sizeof(CK_BBOOL) },
15241524
{ CKA_EXTRACTABLE, &extractable, sizeof(CK_BBOOL) },
15251525
{ CKA_MODIFIABLE, &modifiable, sizeof(CK_BBOOL) },
@@ -7854,7 +7854,7 @@ static CK_RV pkcs11_init(const char* library)
78547854
}
78557855

78567856
if (ret == CKR_OK) {
7857-
func = (CK_C_GetFunctionList)dlsym(dlib, "C_GetFunctionList");
7857+
func = (void*)(CK_C_GetFunctionList)dlsym(dlib, "C_GetFunctionList");
78587858
if (func == NULL) {
78597859
fprintf(stderr, "Failed to get function list function\n");
78607860
ret = -1;

0 commit comments

Comments
 (0)