Ticket #12: engine_pkcs11.c.diffs

*** ./engine_pkcs11.c.orig      2008-07-31 10:49:08.000000000 -0400
--- ./engine_pkcs11.c   2008-09-09 16:44:15.000000000 -0400
***************
*** 391,397 ****
        PKCS11_TOKEN *tok;
        PKCS11_CERT *certs, *selected_cert = NULL;
        X509 *x509;
!       unsigned int count, n, m;
        unsigned char cert_id[MAX_VALUE_LEN / 2];
        size_t cert_id_len = sizeof(cert_id);
        char *cert_label = NULL;
--- 391,397 ----
        PKCS11_TOKEN *tok;
        PKCS11_CERT *certs, *selected_cert = NULL;
        X509 *x509;
!       unsigned int slot_count, cert_count, n, m;
        unsigned char cert_id[MAX_VALUE_LEN / 2];
        size_t cert_id_len = sizeof(cert_id);
        char *cert_label = NULL;
***************
*** 425,438 ****
                }
        }
  
!       if (PKCS11_enumerate_slots(ctx, &slot_list, &count) < 0)
                fail("failed to enumerate slots\n");
  
        if (verbose) {
!               fprintf(stderr, "Found %u slot%s\n", count,
!                       (count <= 1) ? "" : "s");
        }
!       for (n = 0; n < count; n++) {
                slot = slot_list + n;
                flags[0] = '\0';
                if (slot->token) {
--- 425,438 ----
                }
        }
  
!       if (PKCS11_enumerate_slots(ctx, &slot_list, &slot_count) < 0)
                fail("failed to enumerate slots\n");
  
        if (verbose) {
!               fprintf(stderr, "Found %u slot%s\n", slot_count,
!                       (slot_count <= 1) ? "" : "s");
        }
!       for (n = 0; n < slot_count; n++) {
                slot = slot_list + n;
                flags[0] = '\0';
                if (slot->token) {
***************
*** 464,483 ****
        }
  
        if (slot_nr == -1) {
!               if (!(slot = PKCS11_find_token(ctx, slot_list, count)))
                        fail("didn't find any tokens\n");
!       } else if (slot_nr >= 0 && slot_nr < count)
                slot = slot_list + slot_nr;
        else {
                fprintf(stderr, "Invalid slot number: %d\n", slot_nr);
!               PKCS11_release_all_slots(ctx, slot_list, count);
                return NULL;
        }
        tok = slot->token;
  
        if (tok == NULL) {
                fprintf(stderr, "Found empty token; \n");
!               PKCS11_release_all_slots(ctx, slot_list, count);
                return NULL;
        }
  
--- 464,483 ----
        }
  
        if (slot_nr == -1) {
!               if (!(slot = PKCS11_find_token(ctx, slot_list, slot_count)))
                        fail("didn't find any tokens\n");
!       } else if (slot_nr >= 0 && slot_nr < slot_count)
                slot = slot_list + slot_nr;
        else {
                fprintf(stderr, "Invalid slot number: %d\n", slot_nr);
!               PKCS11_release_all_slots(ctx, slot_list, slot_count);
                return NULL;
        }
        tok = slot->token;
  
        if (tok == NULL) {
                fprintf(stderr, "Found empty token; \n");
!               PKCS11_release_all_slots(ctx, slot_list, slot_count);
                return NULL;
        }
  
***************
*** 486,503 ****
                fprintf(stderr, "Found token: %s\n", slot->token->label);
        }
  
!       if (PKCS11_enumerate_certs(tok, &certs, &count)) {
                fprintf(stderr, "unable to enumerate certificates\n");
!               PKCS11_release_all_slots(ctx, slot_list, count);
                return NULL;
        }
  
        if (verbose) {
!               fprintf(stderr, "Found %u cert%s:\n", count,
!                       (count <= 1) ? "" : "s");
        }
        if ((s_slot_cert_id && *s_slot_cert_id) || (cert_id_len == 0)) {
!               for (n = 0; n < count; n++) {
                        PKCS11_CERT *k = certs + n;
  
                        if (cert_id_len != 0 && k->id_len == cert_id_len &&
--- 486,503 ----
                fprintf(stderr, "Found token: %s\n", slot->token->label);
        }
  
!       if (PKCS11_enumerate_certs(tok, &certs, &cert_count)) {
                fprintf(stderr, "unable to enumerate certificates\n");
!               PKCS11_release_all_slots(ctx, slot_list, slot_count);
                return NULL;
        }
  
        if (verbose) {
!               fprintf(stderr, "Found %u cert%s:\n", cert_count,
!                       (cert_count <= 1) ? "" : "s");
        }
        if ((s_slot_cert_id && *s_slot_cert_id) || (cert_id_len == 0)) {
!               for (n = 0; n < cert_count; n++) {
                        PKCS11_CERT *k = certs + n;
  
                        if (cert_id_len != 0 && k->id_len == cert_id_len &&
***************
*** 511,517 ****
  
        if (selected_cert == NULL) {
                fprintf(stderr, "certificate not found.\n");
!               PKCS11_release_all_slots(ctx, slot_list, count);
                return NULL;
        }
  
--- 511,517 ----
  
        if (selected_cert == NULL) {
                fprintf(stderr, "certificate not found.\n");
!               PKCS11_release_all_slots(ctx, slot_list, slot_count);
                return NULL;
        }