Overview
Comment: | ChromeOS: More work towards a functioning system |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a7af34860d31731d21b2eaf162defeb8 |
User & Date: | rkeene on 2016-02-12 03:48:20 |
Other Links: | manifest | tags |
Context
2016-02-12
| ||
04:04 | Better invocation of "ar" for static CACKey builds check-in: 2eba6a47c6 user: rkeene tags: trunk | |
03:48 | ChromeOS: More work towards a functioning system check-in: a7af34860d user: rkeene tags: trunk | |
03:47 | ChromeOS: Disable DOD certs getting built-in to CACKey since they will never get used anyway check-in: 8c99b5e102 user: rkeene tags: trunk | |
Changes
Modified build/chrome/cackey-chrome-test.c from [5b31fe8fb3] to [335a817cb9].
1 2 3 4 5 6 | #include <stdio.h> #include "cackey-chrome.h" int main(int argc, char **argv) { struct cackey_certificate *certificates; | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include <string.h> #include <unistd.h> #include <stdlib.h> #include <stdio.h> #include "cackey-chrome.h" int main(int argc, char **argv) { struct cackey_certificate *certificates; char *pinPrompt = NULL, pin[32]; unsigned char signBuffer[1024]; int numCertificates, idxCertificate; unsigned long signLength; cackey_chrome_returnType rvSign; numCertificates = cackey_chrome_listCertificates(&certificates); printf("numCertificates = %i\n", numCertificates); for (idxCertificate = 0; idxCertificate < numCertificates; idxCertificate++) { printf("Certificate #%i: %lu bytes\n", idxCertificate, certificates[idxCertificate].certificate_len); signLength = sizeof(signBuffer); rvSign = cackey_chrome_signMessage(&certificates[idxCertificate], "Test", 4, signBuffer, &signLength, &pinPrompt, NULL); if (rvSign == CACKEY_CHROME_NEEDLOGIN) { if (pinPrompt == NULL) { pinPrompt = strdup("Please enter your PIN: "); } printf("%s: ", pinPrompt); fflush(stdout); free(pinPrompt); fgets(pin, sizeof(pin), stdin); while (strlen(pin) >= 1 && pin[strlen(pin) - 1] == '\n') { pin[strlen(pin) - 1] = '\0'; } signLength = sizeof(signBuffer); rvSign = cackey_chrome_signMessage(&certificates[idxCertificate], "Test", 4, signBuffer, &signLength, &pinPrompt, pin); } printf("Signed message \"Test\": %lu bytes (return value = %i)\n", signLength, rvSign); } cackey_chrome_freeCertificates(certificates, numCertificates); cackey_chrome_terminate(); return(0); } |
Modified build/chrome/cackey-chrome.c from [b0e4dd691b] to [145025308e].
1 2 3 4 5 6 7 8 9 10 11 | #ifdef __cplusplus extern "C" { #endif #include <unistd.h> #include <stdlib.h> #include "mypkcs11.h" #include "cackey-chrome.h" struct cackey_chrome_id { | > > | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | #ifdef __cplusplus extern "C" { #endif #include <unistd.h> #include <stdlib.h> #include <string.h> #include <stdio.h> #include "mypkcs11.h" #include "cackey-chrome.h" struct cackey_chrome_id { void *id; size_t idLen; int initialized; }; static CK_FUNCTION_LIST_PTR moduleFunctionList = NULL; static CK_RV cackey_chrome_init(void) { CK_C_INITIALIZE_ARGS initargs; CK_RV chk_rv; |
︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | chk_rv = moduleFunctionList->C_Initialize(&initargs); if (chk_rv != CKR_OK) { return(chk_rv); } return(CKR_OK); } int cackey_chrome_listCertificates(struct cackey_certificate **certificates) { CK_RV chk_rv; CK_ULONG numSlots, currSlot; CK_SLOT_ID_PTR slots; CK_SLOT_INFO slotInfo; CK_SESSION_HANDLE hSession; CK_OBJECT_HANDLE hObject; CK_ULONG ulObjectCount; CK_ATTRIBUTE searchTemplatePrivateKeys[] = { {CKA_CLASS, NULL, sizeof(CK_OBJECT_CLASS)} }; CK_ATTRIBUTE searchTemplateCertificates[] = { {CKA_CLASS, NULL, sizeof(CK_OBJECT_CLASS)}, {CKA_ID, NULL, 0} }; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > | > > > > > > > > > > > > > > > > > > > > > | 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 | chk_rv = moduleFunctionList->C_Initialize(&initargs); if (chk_rv != CKR_OK) { return(chk_rv); } return(CKR_OK); } void cackey_chrome_terminate(void) { if (!moduleFunctionList) { return; } moduleFunctionList->C_Finalize(NULL); free(moduleFunctionList); moduleFunctionList = NULL; return; } static CK_RV cackey_chrome_GetAttributesFromTemplate(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, CK_ATTRIBUTE *attrTemplate, CK_ULONG attrTemplateCount) { CK_RV chk_rv; CK_ATTRIBUTE *currAttr; CK_ULONG currAttrIndex; for (currAttrIndex = 0; currAttrIndex < attrTemplateCount; currAttrIndex++) { currAttr = &attrTemplate[currAttrIndex]; currAttr->pValue = NULL; currAttr->ulValueLen = 0; } chk_rv = moduleFunctionList->C_GetAttributeValue(hSession, hObject, attrTemplate, attrTemplateCount); if (chk_rv == CKR_ATTRIBUTE_TYPE_INVALID || chk_rv == CKR_ATTRIBUTE_SENSITIVE || chk_rv == CKR_BUFFER_TOO_SMALL) { chk_rv = CKR_OK; } if (chk_rv != CKR_OK) { return(chk_rv); } for (currAttrIndex = 0; currAttrIndex < attrTemplateCount; currAttrIndex++) { currAttr = &attrTemplate[currAttrIndex]; if (currAttr->ulValueLen == 0) { continue; } if (((CK_LONG) currAttr->ulValueLen) == ((CK_LONG) -1)) { continue; } currAttr->pValue = malloc(currAttr->ulValueLen); } chk_rv = moduleFunctionList->C_GetAttributeValue(hSession, hObject, attrTemplate, attrTemplateCount); if (chk_rv != CKR_OK) { free(currAttr->pValue); return(chk_rv); } return(CKR_OK); } int cackey_chrome_listCertificates(struct cackey_certificate **certificates) { CK_RV chk_rv; CK_ULONG numSlots, currSlot; CK_SLOT_ID_PTR slots; CK_SLOT_INFO slotInfo; CK_SESSION_HANDLE hSession; CK_OBJECT_HANDLE hObject; CK_ULONG ulObjectCount; CK_ATTRIBUTE searchTemplatePrivateKeys[] = { {CKA_CLASS, NULL, sizeof(CK_OBJECT_CLASS)} }; CK_ATTRIBUTE searchTemplateCertificates[] = { {CKA_CLASS, NULL, sizeof(CK_OBJECT_CLASS)}, {CKA_ID, NULL, 0} }; CK_ATTRIBUTE attrTemplatePrivateKey[] = { {CKA_ID, NULL, 0} }; CK_ATTRIBUTE attrTemplateCertificate[] = { {CKA_VALUE, NULL, 0} }; CK_OBJECT_CLASS objectClassPrivateKey = CKO_PRIVATE_KEY; CK_OBJECT_CLASS objectClassCertificate = CKO_CERTIFICATE; struct cackey_chrome_id *ids; int idsCount, currId; int foundCertificates, certificatesCount; *certificates = NULL; chk_rv = cackey_chrome_init(); if (chk_rv != CKR_OK) { return(0); } chk_rv = moduleFunctionList->C_GetSlotList(FALSE, NULL, &numSlots); if (chk_rv != CKR_OK) { return(0); } slots = malloc(sizeof(*slots) * numSlots); chk_rv = moduleFunctionList->C_GetSlotList(FALSE, slots, &numSlots); if (chk_rv != CKR_OK) { free(slots); return(0); } searchTemplatePrivateKeys[0].pValue = &objectClassPrivateKey; searchTemplateCertificates[0].pValue = &objectClassCertificate; foundCertificates = 0; certificatesCount = 10; *certificates = malloc(sizeof(**certificates) * certificatesCount); idsCount = 10; ids = malloc(sizeof(*ids) * idsCount); for (currId = 0; currId < idsCount; currId++) { ids[currId].initialized = 0; } for (currSlot = 0; currSlot < numSlots; currSlot++) { chk_rv = moduleFunctionList->C_GetSlotInfo(slots[currSlot], &slotInfo); if (chk_rv != CKR_OK) { continue; } |
︙ | ︙ | |||
100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | chk_rv = moduleFunctionList->C_FindObjectsInit(hSession, searchTemplatePrivateKeys, sizeof(searchTemplatePrivateKeys) / sizeof(searchTemplatePrivateKeys[0])); if (chk_rv != CKR_OK) { moduleFunctionList->C_CloseSession(hSession); continue; } while (1) { chk_rv = moduleFunctionList->C_FindObjects(hSession, &hObject, 1, &ulObjectCount); if (chk_rv != CKR_OK) { break; } if (ulObjectCount == 0) { break; } if (ulObjectCount != 1) { break; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | > > > > | | < > | > | > > | > > | > | > > > > > > > > > | > | > | > > | > | | | > > > > > | > > > > > > > > > > > > > > | > > > > > | > > > | > > | > > | > > > > > > | > > > | | | > > | | > | > > > > > > > > > > > > > | | > > > > > | > | > > > > > > > | | 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 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 | chk_rv = moduleFunctionList->C_FindObjectsInit(hSession, searchTemplatePrivateKeys, sizeof(searchTemplatePrivateKeys) / sizeof(searchTemplatePrivateKeys[0])); if (chk_rv != CKR_OK) { moduleFunctionList->C_CloseSession(hSession); continue; } for (currId = 0; currId < idsCount; currId++) { if (!ids[currId].initialized) { continue; } free(ids[currId].id); ids[currId].initialized = 0; } currId = 0; while (1) { chk_rv = moduleFunctionList->C_FindObjects(hSession, &hObject, 1, &ulObjectCount); if (chk_rv != CKR_OK) { break; } if (ulObjectCount == 0) { break; } if (ulObjectCount != 1) { break; } chk_rv = cackey_chrome_GetAttributesFromTemplate(hSession, hObject, attrTemplatePrivateKey, sizeof(attrTemplatePrivateKey) / sizeof(attrTemplatePrivateKey[0])); if (chk_rv != CKR_OK) { continue; } if (currId >= idsCount) { idsCount *= 2; ids = realloc(ids, sizeof(*ids) * idsCount); } ids[currId].idLen = attrTemplatePrivateKey[0].ulValueLen; ids[currId].id = attrTemplatePrivateKey[0].pValue; ids[currId].initialized = 1; currId++; } moduleFunctionList->C_FindObjectsFinal(hSession); for (currId = 0; currId < idsCount; currId++) { if (!ids[currId].initialized) { continue; } searchTemplateCertificates[1].pValue = ids[currId].id; searchTemplateCertificates[1].ulValueLen = ids[currId].idLen; chk_rv = moduleFunctionList->C_FindObjectsInit(hSession, searchTemplateCertificates, sizeof(searchTemplateCertificates) / sizeof(searchTemplateCertificates[0])); if (chk_rv != CKR_OK) { free(ids[currId].id); ids[currId].initialized = 0; continue; } while (1) { chk_rv = moduleFunctionList->C_FindObjects(hSession, &hObject, 1, &ulObjectCount); if (chk_rv != CKR_OK) { break; } if (ulObjectCount == 0) { break; } if (ulObjectCount != 1) { break; } chk_rv = cackey_chrome_GetAttributesFromTemplate(hSession, hObject, attrTemplateCertificate, sizeof(attrTemplateCertificate) / sizeof(attrTemplateCertificate[0])); if (chk_rv != CKR_OK) { continue; } if (foundCertificates >= certificatesCount) { certificatesCount *= 2; *certificates = realloc(*certificates, sizeof(**certificates) * certificatesCount); } (*certificates)[foundCertificates].certificate = malloc(attrTemplateCertificate[0].ulValueLen); memcpy((*certificates)[foundCertificates].certificate, attrTemplateCertificate[0].pValue, attrTemplateCertificate[0].ulValueLen); (*certificates)[foundCertificates].certificate_len = attrTemplateCertificate[0].ulValueLen; free(attrTemplateCertificate[0].pValue); foundCertificates++; } moduleFunctionList->C_FindObjectsFinal(hSession); free(ids[currId].id); ids[currId].initialized = 0; } moduleFunctionList->C_CloseSession(hSession); } for (currId = 0; currId < idsCount; currId++) { if (!ids[currId].initialized) { continue; } free(ids[currId].id); ids[currId].initialized = 0; } free(ids); free(slots); return(foundCertificates); } void cackey_chrome_freeCertificates(struct cackey_certificate *certificates, int certificatesCount) { int idx; if (certificates == NULL) { return; } for (idx = 0; idx < certificatesCount; idx++) { if (certificates[idx].certificate) { free(certificates[idx].certificate); } } free(certificates); return; } cackey_chrome_returnType cackey_chrome_signMessage(struct cackey_certificate *certificate, void *data, unsigned long dataLength, unsigned char *destination, unsigned long *destinationLength, char **pinPrompt, char *pin) { CK_RV chk_rv; CK_ULONG numSlots, currSlot; CK_SLOT_ID_PTR slots; CK_SLOT_INFO slotInfo; CK_SESSION_HANDLE hSession; CK_OBJECT_HANDLE hObject, hKey; CK_ULONG ulObjectCount; CK_ATTRIBUTE searchTemplateCertificates[] = { {CKA_CLASS, NULL, sizeof(CK_OBJECT_CLASS)}, {CKA_VALUE, NULL, 0} }; CK_ATTRIBUTE searchTemplatePrivateKeys[] = { {CKA_CLASS, NULL, sizeof(CK_OBJECT_CLASS)}, {CKA_ID, NULL, 0} }; CK_ATTRIBUTE attrTemplateCertificate[] = { {CKA_ID, NULL, 0}, {CKA_LABEL, NULL, 0} }; CK_MECHANISM signMechanism = {CKM_RSA_PKCS, NULL, 0}; CK_OBJECT_CLASS objectClassPrivateKey = CKO_PRIVATE_KEY; CK_OBJECT_CLASS objectClassCertificate = CKO_CERTIFICATE; CK_TOKEN_INFO tokenInfo; CK_ULONG tmpDestinationLength; char *certificateLabel; int foundPrivateKeyObject; cackey_chrome_returnType retval; *pinPrompt = NULL; retval = CACKEY_CHROME_ERROR; chk_rv = cackey_chrome_init(); if (chk_rv != CKR_OK) { return(retval); } chk_rv = moduleFunctionList->C_GetSlotList(FALSE, NULL, &numSlots); if (chk_rv != CKR_OK) { return(retval); } slots = malloc(sizeof(*slots) * numSlots); chk_rv = moduleFunctionList->C_GetSlotList(FALSE, slots, &numSlots); if (chk_rv != CKR_OK) { free(slots); return(retval); } searchTemplateCertificates[0].pValue = &objectClassCertificate; searchTemplatePrivateKeys[0].pValue = &objectClassPrivateKey; searchTemplateCertificates[1].pValue = certificate->certificate; searchTemplateCertificates[1].ulValueLen = certificate->certificate_len; foundPrivateKeyObject = 0; certificateLabel = NULL; for (currSlot = 0; currSlot < numSlots; currSlot++) { chk_rv = moduleFunctionList->C_GetSlotInfo(slots[currSlot], &slotInfo); if (chk_rv != CKR_OK) { continue; } if ((slotInfo.flags & CKF_TOKEN_PRESENT) != CKF_TOKEN_PRESENT) { continue; } chk_rv = moduleFunctionList->C_OpenSession(slots[currSlot], CKF_SERIAL_SESSION, NULL, NULL, &hSession); if (chk_rv != CKR_OK) { continue; } chk_rv = moduleFunctionList->C_FindObjectsInit(hSession, searchTemplateCertificates, sizeof(searchTemplateCertificates) / sizeof(searchTemplateCertificates[0])); if (chk_rv != CKR_OK) { moduleFunctionList->C_CloseSession(hSession); continue; } while (1) { chk_rv = moduleFunctionList->C_FindObjects(hSession, &hObject, 1, &ulObjectCount); if (chk_rv != CKR_OK) { break; } if (ulObjectCount == 0) { break; } if (ulObjectCount != 1) { break; } chk_rv = cackey_chrome_GetAttributesFromTemplate(hSession, hObject, attrTemplateCertificate, sizeof(attrTemplateCertificate) / sizeof(attrTemplateCertificate[0])); if (chk_rv != CKR_OK) { continue; } searchTemplatePrivateKeys[1].pValue = attrTemplateCertificate[0].pValue; searchTemplatePrivateKeys[1].ulValueLen = attrTemplateCertificate[0].ulValueLen; if (attrTemplateCertificate[1].ulValueLen > 0 && attrTemplateCertificate[1].pValue != NULL) { certificateLabel = malloc(attrTemplateCertificate[1].ulValueLen + 1); memcpy(certificateLabel, attrTemplateCertificate[1].pValue, attrTemplateCertificate[1].ulValueLen); certificateLabel[attrTemplateCertificate[1].ulValueLen] = '\0'; } break; } moduleFunctionList->C_FindObjectsFinal(hSession); if (searchTemplatePrivateKeys[1].pValue != NULL) { chk_rv = moduleFunctionList->C_FindObjectsInit(hSession, searchTemplateCertificates, sizeof(searchTemplateCertificates) / sizeof(searchTemplateCertificates[0])); if (chk_rv == CKR_OK) { while (1) { chk_rv = moduleFunctionList->C_FindObjects(hSession, &hObject, 1, &ulObjectCount); if (chk_rv != CKR_OK) { break; } if (ulObjectCount == 0) { break; } if (ulObjectCount != 1) { break; } hKey = hObject; foundPrivateKeyObject = 1; break; } moduleFunctionList->C_FindObjectsFinal(hSession); } free(searchTemplatePrivateKeys[1].pValue); } if (foundPrivateKeyObject) { chk_rv = moduleFunctionList->C_SignInit(hSession, &signMechanism, hKey); if (chk_rv != CKR_OK) { break; } tmpDestinationLength = *destinationLength; chk_rv = moduleFunctionList->C_Sign(hSession, data, dataLength, destination, &tmpDestinationLength); switch (chk_rv) { case CKR_OK: *destinationLength = tmpDestinationLength; retval = CACKEY_CHROME_OK; break; case CKR_USER_NOT_LOGGED_IN: chk_rv = moduleFunctionList->C_GetTokenInfo(slots[currSlot], &tokenInfo); if (chk_rv == CKR_OK) { if ((tokenInfo.flags & CKF_PROTECTED_AUTHENTICATION_PATH) == CKF_PROTECTED_AUTHENTICATION_PATH) { retval = CACKEY_CHROME_NEEDPROTECTEDLOGIN; } else { retval = CACKEY_CHROME_NEEDLOGIN; *pinPrompt = malloc(1024); if (certificateLabel) { snprintf(*pinPrompt, 1024, "Please enter the PIN for %s:%s", tokenInfo.label, certificateLabel); } else { snprintf(*pinPrompt, 1024, "Please enter the PIN for %s", tokenInfo.label); } } } else { retval = CACKEY_CHROME_NEEDLOGIN; *pinPrompt = strdup("Please enter your Smartcard PIN"); } if (retval == CACKEY_CHROME_NEEDPROTECTEDLOGIN) { retval = CACKEY_CHROME_ERROR; chk_rv = moduleFunctionList->C_Login(hSession, CKU_USER, NULL, 0); } else { if (pin) { retval = CACKEY_CHROME_ERROR; free(*pinPrompt); *pinPrompt = NULL; chk_rv = moduleFunctionList->C_Login(hSession, CKU_USER, (CK_UTF8CHAR_PTR) pin, strlen(pin)); } else { chk_rv = CKR_GENERAL_ERROR; } } if (chk_rv == CKR_OK && retval == CACKEY_CHROME_ERROR) { chk_rv = moduleFunctionList->C_SignInit(hSession, &signMechanism, hKey); if (chk_rv != CKR_OK) { break; } tmpDestinationLength = *destinationLength; chk_rv = moduleFunctionList->C_Sign(hSession, data, dataLength, destination, &tmpDestinationLength); switch (chk_rv) { case CKR_OK: *destinationLength = tmpDestinationLength; retval = CACKEY_CHROME_OK; break; case CKR_USER_NOT_LOGGED_IN: retval = CACKEY_CHROME_NEEDLOGIN; break; default: retval = CACKEY_CHROME_ERROR; break; } } break; default: retval = CACKEY_CHROME_ERROR; break; } break; } moduleFunctionList->C_CloseSession(hSession); } free(slots); if (certificateLabel) { free(certificateLabel); } return(retval); } #ifdef __cplusplus } #endif |
Modified build/chrome/cackey-chrome.h from [3dcc1f6bc2] to [9c067c4d11].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | #include <stddef.h> struct cackey_certificate { size_t certificate_len; unsigned char *certificate; }; int cackey_chrome_listCertificates(struct cackey_certificate **certificates); # ifdef __cplusplus } # endif #endif | > > > > > > > > > > > > | 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 | #include <stddef.h> struct cackey_certificate { size_t certificate_len; unsigned char *certificate; }; typedef enum { CACKEY_CHROME_OK, CACKEY_CHROME_ERROR, CACKEY_CHROME_NEEDLOGIN, CACKEY_CHROME_NEEDPROTECTEDLOGIN } cackey_chrome_returnType; int cackey_chrome_listCertificates(struct cackey_certificate **certificates); void cackey_chrome_freeCertificates(struct cackey_certificate *certificates, int certificatesCount); cackey_chrome_returnType cackey_chrome_signMessage(struct cackey_certificate *certificate, void *data, unsigned long dataLength, unsigned char *destination, unsigned long *destinationLength, char **pinPrompt, char *pin); void cackey_chrome_terminate(void); # ifdef __cplusplus } # endif #endif |