Mercurial > trustbridge
comparison cinst/mozilla.c @ 625:2303caf56dbb
Add logging function for der data and add logging to NSS installation
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 20 Jun 2014 12:53:16 +0200 |
| parents | 2c4eb4435a40 |
| children | 698b6a9bd75e |
comparison
equal
deleted
inserted
replaced
| 624:736e95c63b86 | 625:2303caf56dbb |
|---|---|
| 447 cert_name, PR_FALSE) | 447 cert_name, PR_FALSE) |
| 448 == SECSuccess) && | 448 == SECSuccess) && |
| 449 (CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), cert, trust) | 449 (CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), cert, trust) |
| 450 == SECSuccess)) | 450 == SECSuccess)) |
| 451 { | 451 { |
| 452 log_certificate_der (pdir, dercert->data, dercert->len, true); | |
| 452 success = true; | 453 success = true; |
| 453 } | 454 } |
| 454 else | 455 else |
| 455 { | 456 { |
| 456 DEBUGPRINTF("Failed to install certificate '%s' to '%s'!\n", cert_name, pdir); | 457 DEBUGPRINTF("Failed to install certificate '%s' to '%s'!\n", cert_name, pdir); |
| 489 if (cert != NULL) | 490 if (cert != NULL) |
| 490 { | 491 { |
| 491 if (SEC_DeletePermCertificate(cert) == SECSuccess) | 492 if (SEC_DeletePermCertificate(cert) == SECSuccess) |
| 492 { | 493 { |
| 493 success = true; | 494 success = true; |
| 495 log_certificate_der (pdir, dercert->data, dercert->len, false); | |
| 494 } | 496 } |
| 495 else | 497 else |
| 496 { | 498 { |
| 497 DEBUGPRINTF("Failed to remove certificate '%s' from '%s'!\n", cert_name, pdir); | 499 DEBUGPRINTF("Failed to remove certificate '%s' from '%s'!\n", cert_name, pdir); |
| 498 } | 500 } |
| 522 * | 524 * |
| 523 * where pdir is the path of an profile and der_cert is an raw DER | 525 * where pdir is the path of an profile and der_cert is an raw DER |
| 524 * formatted certificate. The function must return true on success | 526 * formatted certificate. The function must return true on success |
| 525 * and false on failure. | 527 * and false on failure. |
| 526 * | 528 * |
| 527 * This function is intended wor use with the import_cert and | 529 * This function is intended for use with the import_cert and |
| 528 * remove_cert functions. | 530 * remove_cert functions. |
| 529 * | 531 * |
| 530 * @param[in] fn the function to apply | 532 * @param[in] fn the function to apply |
| 531 * @param[inout] certs a secitem list holding the certificates | 533 * @param[inout] certs a secitem list holding the certificates |
| 532 * the list will be change (emptied)! | 534 * the list will be change (emptied)! |