ansasaki / rpms / libp11

Forked from rpms/libp11 6 years ago
Clone
Nikos Mavrogiannopoulos a064d24
diff --git a/examples/listkeys.c b/examples/listkeys.c
Nikos Mavrogiannopoulos a064d24
index 5e4249b..38e16b9 100644
Nikos Mavrogiannopoulos a064d24
--- a/examples/listkeys.c
Nikos Mavrogiannopoulos a064d24
+++ b/examples/listkeys.c
Nikos Mavrogiannopoulos a064d24
@@ -77,13 +77,6 @@ int main(int argc, char *argv[])
Nikos Mavrogiannopoulos a064d24
 	printf("Slot token model.......: %s\n", slot->token->model);
Nikos Mavrogiannopoulos a064d24
 	printf("Slot token serialnr....: %s\n", slot->token->serialnr);
Nikos Mavrogiannopoulos a064d24
 
Nikos Mavrogiannopoulos a064d24
-	/* get public keys */
Nikos Mavrogiannopoulos a064d24
-	rc = PKCS11_enumerate_public_keys(slot->token, &keys, &nkeys);
Nikos Mavrogiannopoulos a064d24
-	error_queue("PKCS11_enumerate_public_keys");
Nikos Mavrogiannopoulos a064d24
-	CHECK_ERR(rc < 0, "PKCS11_enumerate_public_keys failed", 4);
Nikos Mavrogiannopoulos a064d24
-	CHECK_ERR(nkeys == 0, "No public keys found", 5);
Nikos Mavrogiannopoulos a064d24
-	list_keys("Public keys", keys, nkeys);
Nikos Mavrogiannopoulos a064d24
-
Nikos Mavrogiannopoulos a064d24
 	if (slot->token->loginRequired && argc > 2) {
Nikos Mavrogiannopoulos a064d24
 		strcpy(password, argv[2]);
Nikos Mavrogiannopoulos a064d24
 		/* perform pkcs #11 login */
Nikos Mavrogiannopoulos a064d24
@@ -93,6 +86,13 @@ int main(int argc, char *argv[])
Nikos Mavrogiannopoulos a064d24
 		CHECK_ERR(rc < 0, "PKCS11_login failed", 6);
Nikos Mavrogiannopoulos a064d24
 	}
Nikos Mavrogiannopoulos a064d24
 
Nikos Mavrogiannopoulos a064d24
+	/* get public keys */
Nikos Mavrogiannopoulos a064d24
+	rc = PKCS11_enumerate_public_keys(slot->token, &keys, &nkeys);
Nikos Mavrogiannopoulos a064d24
+	error_queue("PKCS11_enumerate_public_keys");
Nikos Mavrogiannopoulos a064d24
+	CHECK_ERR(rc < 0, "PKCS11_enumerate_public_keys failed", 4);
Nikos Mavrogiannopoulos a064d24
+	CHECK_ERR(nkeys == 0, "No public keys found", 5);
Nikos Mavrogiannopoulos a064d24
+	list_keys("Public keys", keys, nkeys);
Nikos Mavrogiannopoulos a064d24
+
Nikos Mavrogiannopoulos a064d24
 	/* get private keys */
Nikos Mavrogiannopoulos a064d24
 	rc = PKCS11_enumerate_keys(slot->token, &keys, &nkeys);
Nikos Mavrogiannopoulos a064d24
 	error_queue("PKCS11_enumerate_keys");
David Woodhouse 049bc3b