[pkg-opensc-commit] [libp11] 74/239: export one additional function.

[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 f76e8bbfc2ff8e8a3d8ef023f2b76ca649db7917
Author: Andreas Jellinghaus <andreas at ionisiert.de>
Date:   Tue Nov 1 23:34:21 2005 +0000

    export one additional function.
---
 configure.ac  | 2 +-
 src/libp11.h  | 3 +++
 src/p11_rsa.c | 7 +++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 967b247..63b0024 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_CONFIG_SRCDIR(src/libp11.h)
 #   (Interfaces added/removed/changed:  CURRENT++, REVISION=0)
 #   (Interfaces added:                  AGE++)
 #   (Interfaces removed:                AGE=0)
-LIBP11_VERSION=1:1:0
+LIBP11_VERSION=1:1:1
 
 AC_SUBST(LIBP11_VERSION)
 
diff --git a/src/libp11.h b/src/libp11.h
index 070b399..96711cc 100644
--- a/src/libp11.h
+++ b/src/libp11.h
@@ -313,6 +313,9 @@ extern int PKCS11_verify(int type, const unsigned char *m, unsigned int m_len,
 extern int PKCS11_seed_random(PKCS11_SLOT *, const unsigned char *s, unsigned int s_len);
 extern int PKCS11_generate_random(PKCS11_SLOT *, unsigned char *r, unsigned int r_len);
 
+/* using with openssl method mechanism */
+RSA_METHOD *PKCS11_get_rsa_method(void);
+
 /**
  * Load PKCS11 error strings
  *
diff --git a/src/p11_rsa.c b/src/p11_rsa.c
index d0595ba..11cd209 100644
--- a/src/p11_rsa.c
+++ b/src/p11_rsa.c
@@ -28,7 +28,6 @@
 
 static int pkcs11_get_rsa_public(PKCS11_KEY *, EVP_PKEY *);
 static int pkcs11_get_rsa_private(PKCS11_KEY *, EVP_PKEY *);
-RSA_METHOD *pkcs11_get_rsa_method(void);
 
 
 /*
@@ -60,7 +59,7 @@ int pkcs11_get_rsa_private(PKCS11_KEY * key, EVP_PKEY * pk)
 	/* If the key is not extractable, create a key object
 	 * that will use the card's functions to sign & decrypt */
 	if (sensitive || !extractable) {
-		RSA_set_method(rsa, pkcs11_get_rsa_method());
+		RSA_set_method(rsa, PKCS11_get_rsa_method());
 		rsa->flags |= RSA_FLAG_SIGN_VER;
 		RSA_set_app_data(rsa, key);
 
@@ -70,7 +69,7 @@ int pkcs11_get_rsa_private(PKCS11_KEY * key, EVP_PKEY * pk)
 
 	/* TBD - extract RSA private key. */
 	/* In the mean time let's use the card anyway */
-	RSA_set_method(rsa, pkcs11_get_rsa_method());
+	RSA_set_method(rsa, PKCS11_get_rsa_method());
 	rsa->flags |= RSA_FLAG_SIGN_VER;
 	RSA_set_app_data(rsa, key);
 
@@ -140,7 +139,7 @@ pkcs11_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
 /*
  * Overload the default OpenSSL methods for RSA
  */
-RSA_METHOD *pkcs11_get_rsa_method(void)
+RSA_METHOD *PKCS11_get_rsa_method(void)
 {
 	static RSA_METHOD ops;
 

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