Changeset 113

Timestamp:

12/06/08 19:43:46 (3 years ago)

Author:

martin

Message:

avoid errors like #12 in the future

File:

• trunk/src/engine_pkcs11.c (modified) (7 diffs)

trunk/src/engine_pkcs11.c

@@ -549 +549 @@
         PKCS11_CERT *certs;
         EVP_PKEY *pk;
-        unsigned int count, n, m;
+        unsigned int slot_count, cert_count, key_count, n, m;
         unsigned char key_id[MAX_VALUE_LEN / 2];
         size_t key_id_len = sizeof(key_id);
@@ -583 +583 @@
         }
 
-        if (PKCS11_enumerate_slots(ctx, &slot_list, &count) < 0)
+        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", count,
-                        (count <= 1) ? "" : "s");
-        }
-        for (n = 0; n < count; n++) {
+                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';
@@ -622 +622 @@
 
         if (slot_nr == -1) {
-                if (!(slot = PKCS11_find_token(ctx, slot_list, count)))
+                if (!(slot = PKCS11_find_token(ctx, slot_list, slot_count)))
                         fail("didn't find any tokens\n");
-        } else if (slot_nr >= 0 && slot_nr < count)
+        } 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, count);
+                PKCS11_release_all_slots(ctx, slot_list, slot_count);
                 return NULL;
         }
@@ -635 +635 @@
         if (tok == NULL) {
                 fprintf(stderr, "Found empty token; \n");
-                PKCS11_release_all_slots(ctx, slot_list, count);
+                PKCS11_release_all_slots(ctx, slot_list, slot_count);
                 return NULL;
         }
@@ -647 +647 @@
         if (isPrivate && !tok->userPinSet && !tok->readOnly) {
                 fprintf(stderr, "Found slot without user PIN\n");
-                PKCS11_release_all_slots(ctx, slot_list, count);
+                PKCS11_release_all_slots(ctx, slot_list, slot_count);
                 return NULL;
         }
@@ -656 +656 @@
         }
 
-        if (PKCS11_enumerate_certs(tok, &certs, &count))
+        if (PKCS11_enumerate_certs(tok, &certs, &cert_count))
                 fail("unable to enumerate certificates\n");
 
         if (verbose) {
-                fprintf(stderr, "Found %u certificate%s:\n", count,
-                        (count <= 1) ? "" : "s");
-                for (n = 0; n < count; n++) {
+                fprintf(stderr, "Found %u certificate%s:\n", cert_count,
+                        (cert_count <= 1) ? "" : "s");
+                for (n = 0; n < cert_count; n++) {
                         PKCS11_CERT *c = certs + n;
                         char *dn = NULL;
@@ -732 +732 @@
 
         /* Make sure there is at least one private key on the token */
-        if (PKCS11_enumerate_keys(tok, &keys, &count)) {
+        if (PKCS11_enumerate_keys(tok, &keys, &key_count)) {
                 fail("unable to enumerate keys\n");
         }
-        if (count == 0) {
+        if (key_count == 0) {
                 fail("No keys found.\n");
         }
 
         if (verbose) {
-                fprintf(stderr, "Found %u key%s:\n", count,
-                        (count <= 1) ? "" : "s");
+                fprintf(stderr, "Found %u key%s:\n", key_count,
+                        (key_count <= 1) ? "" : "s");
         }
         if (s_slot_key_id && *s_slot_key_id) {
-                for (n = 0; n < count; n++) {
+                for (n = 0; n < key_count; n++) {
                         PKCS11_KEY *k = keys + n;