From 189a692012ccb72fa428334fda2c9f71e5d099bf Mon Sep 17 00:00:00 2001
From: sth <sth@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Tue, 22 Apr 2003 20:43:02 +0000
Subject: [PATCH] Fix in case no OpenSSL is present

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1065 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/tools/pkcs11-tool.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
index 81951b27..47d56c6b 100644
--- a/src/tools/pkcs11-tool.c
+++ b/src/tools/pkcs11-tool.c
@@ -1451,14 +1451,11 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
 	return errors;
 }
 
+#ifdef HAVE_OPENSSL
 static int
 wrap_unwrap(CK_SLOT_ID slot, CK_SESSION_HANDLE session,
 	    const EVP_CIPHER *algo, CK_OBJECT_HANDLE privKeyObject)
 {
-#ifndef HAVE_OPENSSL
-	printf("No OpenSSL support, unable to validate C_Unwrap\n");
-	return 0;
-#else
 	CK_OBJECT_HANDLE cipherKeyObject;
 	CK_RV           rv;
 	EVP_PKEY       *pkey;
@@ -1534,8 +1531,8 @@ wrap_unwrap(CK_SLOT_ID slot, CK_SESSION_HANDLE session,
 
 	printf("OK\n");
 	return 0;
-#endif
 }
+#endif
 
 
 /*
@@ -1580,10 +1577,14 @@ test_unwrap(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
 		}
 		printf("\n");
 
+#ifndef HAVE_OPENSSL
+		printf("No OpenSSL support, unable to validate C_Unwrap\n");
+#else
 		errors += wrap_unwrap(slot, sess, EVP_des_cbc(), privKeyObject);
 		errors += wrap_unwrap(slot, sess, EVP_des_ede3_cbc(), privKeyObject);
 		errors += wrap_unwrap(slot, sess, EVP_bf_cbc(), privKeyObject);
 		errors += wrap_unwrap(slot, sess, EVP_cast5_cfb(), privKeyObject);
+#endif
 	}
 
 	return errors;