[pkg-opensc-commit] [engine-pkcs11] 02/07: Remove references to PKCS11_ecdsa_method_free()

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository engine-pkcs11.

commit 20fba9e9b36fb85965b8e9ba027f7a7f89f2b687
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Mon Mar 28 16:46:02 2016 +0200

    Remove references to PKCS11_ecdsa_method_free()
---
 configure.ac    | 12 +-----------
 src/hw_pkcs11.c |  6 ------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index e00d8ec..9d5046c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.60)
 
 define([PACKAGE_VERSION_MAJOR], [0])
 define([PACKAGE_VERSION_MINOR], [2])
-define([PACKAGE_VERSION_FIX], [1])
+define([PACKAGE_VERSION_FIX], [2])
 define([PACKAGE_SUFFIX], [])
 
 AC_INIT([engine_pkcs11],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX])
@@ -145,16 +145,6 @@ PKG_CHECK_MODULES(
 	,
 	[AC_MSG_ERROR([libp11 >= 0.3.1 is required])])
 
-saved_LIBS=$LIBS
-LIBS="$LIBP11_LIBS"
-AC_CHECK_LIB(
-	[p11],
-	[PKCS11_ecdsa_method_free],
-	,
-	[AC_DEFINE([OPENSSL_NO_ECDSA], [1],
-		[ECDSA support was not detected in libp11.])])
-LIBS=$saved_LIBS
-
 # The "libcrypto" module is not defined in OpenSSL 0.9.7
 # TODO: Deprecate OpenSSL 0.9.7 and stop checking for the "openssl" module
 PKG_CHECK_MODULES(
diff --git a/src/hw_pkcs11.c b/src/hw_pkcs11.c
index ed40e75..af245bf 100644
--- a/src/hw_pkcs11.c
+++ b/src/hw_pkcs11.c
@@ -128,12 +128,6 @@ static const ENGINE_CMD_DEFN pkcs11_cmd_defns[] = {
 static int pkcs11_engine_destroy(ENGINE * e)
 {
 	(void)e;
-#ifndef OPENSSL_NO_EC
-#ifndef OPENSSL_NO_ECDSA
-	PKCS11_ecdsa_method_free();
-#endif
-#endif
-
 	return 1;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/engine-pkcs11.git