[pkg-opensc-commit] [libp11] 09/51: Partially revert "Do not set default RSA and EC methods"

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libp11.

commit 1029978e00142f13a158a750def4eb279a4a868c
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sun Oct 2 00:51:22 2016 +0100

    Partially revert "Do not set default RSA and EC methods"
    
    Since commit f160e2fc ("Gracefully handle alien RSA keys") it's OK for the
    engine to be set as the default method for RSA keys. And since the openssl
    command line tool in many released versions forgets to do ENGINE_init(), it
    *only* works if the engine is default for *something*, as discussed in
    https://github.com/openssl/openssl/pull/1643
    
    This reverts the RSA part of commit b9b7941765b7d6cd4c0d003b53b9d44801179ebe.
    
    Closes #118
---
 src/eng_front.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/eng_front.c b/src/eng_front.c
index 59ad726..d170604 100644
--- a/src/eng_front.c
+++ b/src/eng_front.c
@@ -211,6 +211,9 @@ static int bind_helper(ENGINE *e)
 			!ENGINE_set_ctrl_function(e, engine_ctrl) ||
 			!ENGINE_set_cmd_defns(e, engine_cmd_defns) ||
 			!ENGINE_set_name(e, PKCS11_ENGINE_NAME) ||
+#ifndef OPENSSL_NO_RSA
+			!ENGINE_set_RSA(e, PKCS11_get_rsa_method()) ||
+#endif
 			!ENGINE_set_load_pubkey_function(e, load_pubkey) ||
 			!ENGINE_set_load_privkey_function(e, load_privkey)) {
 		return 0;

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