From 781c3c0fff0c795cb390461fa96ea7dc81a3a88b Mon Sep 17 00:00:00 2001
From: s <s@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Tue, 8 Dec 2009 18:34:55 +0000
Subject: [PATCH] add to changeset 3887

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3888 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/pkcs11/framework-pkcs15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c
index 2680f989..932c34c3 100644
--- a/src/pkcs11/framework-pkcs15.c
+++ b/src/pkcs11/framework-pkcs15.c
@@ -1637,7 +1637,7 @@ static CK_RV pkcs15_gen_keypair(struct sc_pkcs11_card *p11card,
 		&keytype, NULL);
 	if (rv != CKR_OK && pMechanism->mechanism == CKM_RSA_PKCS_KEY_PAIR_GEN)
 		keytype = CKK_RSA;
-	else
+	else if (rv != CKR_OK)
 		goto kpgen_done;
 	if (keytype == CKK_GOSTR3410)
 	{