Changeset 7

Timestamp:

09/01/05 17:52:41 (3 years ago)

Author:

aj

Message:

bring source in sync with latest libp11.

Files:

• trunk/src/pam_p11.c (modified) (5 diffs)

trunk/src/pam_p11.c

@@ -75 +75 @@
 
         PKCS11_CTX *ctx;
-        PKCS11_SLOT *slot;
+        PKCS11_SLOT *slot, *slots;
         PKCS11_CERT *certs;
-        unsigned int ncerts;
+        unsigned int nslots, ncerts;
         PKCS11_KEY *authkey;
         PKCS11_CERT *authcert;
@@ -90 +90 @@
         /* open log */
         openlog(LOGNAME, LOG_CONS | LOG_PID, LOG_AUTHPRIV);
+
+        /* check parameters */
+        if (argc != 2) {
+                syslog(LOG_ERR, "%s failed: need pkcs11 module as argument",
+                                argv[0]);
+                return PAM_ABORT;
+        }
 
         /* init openssl */
@@ -107 +114 @@
         /* load pkcs #11 module */
         rv = PKCS11_CTX_load(ctx, argv[0]);
-
         if (rv) {
                 syslog(LOG_ERR, "loading pkcs11 engine failed");
@@ -113 +119 @@
         }
 
-        /* get first slot with a token */
-        slot = PKCS11_find_token(ctx);
+        /* get all slots */ 
+        rv = PKCS11_enumerate_slots(ctx, &slots, &nslots);
+        if (rv) {
+                syslog(LOG_ERR, "listing slots failed");
+                return PAM_AUTHINFO_UNAVAIL;
+        }
+
+        /* search for the first slot with a token */
+        slot = PKCS11_find_token(ctx, slots, nslots);
         if (!slot || !slot->token) {
                 syslog(LOG_ERR, "no token available");
@@ -284 +297 @@
 
       out:
+        PKCS11_release_all_slots(ctx, slots, nslots);
         PKCS11_CTX_unload(ctx);
         PKCS11_CTX_free(ctx);