From 85ab01a8cd09047d8aec499b432486fca9036c72 Mon Sep 17 00:00:00 2001
From: aj <aj@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Sun, 17 Jul 2005 09:39:44 +0000
Subject: [PATCH] fail() returned NULL, windows need return 0;

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2410 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libp11/p11_key.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/libp11/p11_key.c b/src/libp11/p11_key.c
index 2ccf5259..d89fd8ca 100644
--- a/src/libp11/p11_key.c
+++ b/src/libp11/p11_key.c
@@ -246,7 +246,6 @@ int pkcs11_find_key(PKCS11_CTX * ctx, PKCS11_KEY **key, char* passphrase, char*
 {
 	/* need to confirm if passphrase required, perhaps substitute callback */
 
-#define fail(msg) { fprintf(stderr,msg); return NULL;}
 	PKCS11_SLOT *slot, *slot_list;
 	PKCS11_TOKEN *tok;
 	PKCS11_CERT *certs;
@@ -351,8 +350,10 @@ int pkcs11_find_key(PKCS11_CTX * ctx, PKCS11_KEY **key, char* passphrase, char*
 	}
 
 	if (slot_nr == -1) {
-		if (!(slot = PKCS11_find_token(ctx)))
-			fail("didn't find any tokens\n");
+		if (!(slot = PKCS11_find_token(ctx))) {
+			fprintf(stderr,"didn't find any tokens\n");
+			return 0;
+		}
 	} else if (slot_nr >= 0 && slot_nr < count)
 		slot = slot_list + slot_nr;
 	else {
@@ -382,8 +383,10 @@ int pkcs11_find_key(PKCS11_CTX * ctx, PKCS11_KEY **key, char* passphrase, char*
 
 
 	if(verbose) {
-		if (PKCS11_enumerate_certs(tok, &certs, &count))
-			fail("unable to enumerate certificates\n");
+		if (PKCS11_enumerate_certs(tok, &certs, &count)) {
+			fprintf(stderr,"unable to enumerate certificates\n");
+			return 0;
+		}
 		fprintf(stderr,"Found %u certificate%s:\n", count, (count <= 1) ? "" : "s");
 		for (n = 0; n < count; n++) {
 			PKCS11_CERT *c = certs + n;
@@ -401,8 +404,10 @@ int pkcs11_find_key(PKCS11_CTX * ctx, PKCS11_KEY **key, char* passphrase, char*
 	}
 
 	while (1) {
-		if (PKCS11_enumerate_keys(tok, &keys, &count))
-			fail("unable to enumerate keys\n");
+		if (PKCS11_enumerate_keys(tok, &keys, &count)) {
+			fprintf(stderr,"unable to enumerate keys\n");
+			return 0;
+		}
 		if (count)
 			break;
 		if (logged_in || !tok->loginRequired)
@@ -418,7 +423,8 @@ int pkcs11_find_key(PKCS11_CTX * ctx, PKCS11_KEY **key, char* passphrase, char*
 				pin = NULL;
 			}*/
 			passphrase=NULL;
-			fail("Card login failed\n");
+			fprintf(stderr,"Card login failed\n");
+			return 0;
 		}
 		logged_in++;
 	}