[pkg-opensc-commit] [engine-pkcs11] 114/152: Engine should only offer support for its own functions

[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 44c7e852d35143b98b0b6cead359199d17f3bbd3
Author: Doug Engert <deengert at gmail.com>
Date:   Wed May 27 14:32:26 2015 -0500

    Engine should only offer support for its own functions
    
    The engine_pkcs11 only need call ENGINE_set_*  for the functions it supports.
    It was calling ENGINE_set_DSA, ENGINE_set_DH, ENGINE_set_RAND using the
    *_get_default_method() for each. OpenSSL will do this for you,
    and a user could select a differnet engine then the default.
---
 src/hw_pkcs11.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/hw_pkcs11.c b/src/hw_pkcs11.c
index 3b538ae..17cad7a 100644
--- a/src/hw_pkcs11.c
+++ b/src/hw_pkcs11.c
@@ -191,12 +191,6 @@ static int bind_helper(ENGINE * e)
 #ifndef OPENSSL_NO_RSA
 	    !ENGINE_set_RSA(e, PKCS11_get_rsa_method()) ||
 #endif
-#ifndef OPENSSL_NO_DSA
-	    !ENGINE_set_DSA(e, DSA_get_default_method()) ||
-#endif
-#ifndef OPENSSL_NO_DH
-	    !ENGINE_set_DH(e, DH_get_default_method()) ||
-#endif
 #ifndef OPENSSL_NO_EC
 #ifndef OPENSSL_NO_ECDSA
 		!ENGINE_set_ECDSA(e, PKCS11_get_ecdsa_method()) ||
@@ -205,10 +199,6 @@ static int bind_helper(ENGINE * e)
 		!ENGINE_set_ECDH(e, PKCS11_get_ecdh_method()) ||
 */
 #endif
-	    !ENGINE_set_RAND(e, RAND_SSLeay()) ||
-#if 0
-	    !ENGINE_set_BN_mod_exp(e, BN_mod_exp) ||
-#endif
 	    !ENGINE_set_load_pubkey_function(e, pkcs11_load_public_key) ||
 	    !ENGINE_set_load_privkey_function(e, pkcs11_load_private_key)) {
 		return 0;

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