[pkg-opensc-commit] [libp11] 102/239: fix more compiler warnings.

[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 0918b2b35d5b9eda13c138983d40bfda05ff518f
Author: Andreas Jellinghaus <andreas at ionisiert.de>
Date:   Fri Jun 29 14:02:36 2007 +0000

    fix more compiler warnings.
---
 src/p11_rsa.c  | 17 +++++++----------
 src/p11_slot.c |  6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/p11_rsa.c b/src/p11_rsa.c
index 11cd209..c8849b1 100644
--- a/src/p11_rsa.c
+++ b/src/p11_rsa.c
@@ -33,7 +33,7 @@ static int pkcs11_get_rsa_private(PKCS11_KEY *, EVP_PKEY *);
 /*
  * Get RSA key material
  */
-int pkcs11_get_rsa_private(PKCS11_KEY * key, EVP_PKEY * pk)
+static int pkcs11_get_rsa_private(PKCS11_KEY * key, EVP_PKEY * pk)
 {
 	CK_BBOOL sensitive, extractable;
 	RSA *rsa;
@@ -82,7 +82,7 @@ int pkcs11_get_rsa_private(PKCS11_KEY * key, EVP_PKEY * pk)
 	*/
 }
 
-int pkcs11_get_rsa_public(PKCS11_KEY * key, EVP_PKEY * pk)
+static int pkcs11_get_rsa_public(PKCS11_KEY * key, EVP_PKEY * pk)
 {
 	/* TBD */
 	return 0;
@@ -90,23 +90,20 @@ int pkcs11_get_rsa_public(PKCS11_KEY * key, EVP_PKEY * pk)
 }
 
 
-static int
-pkcs11_rsa_decrypt(int flen, const unsigned char *from, unsigned char *to,
-		   RSA * rsa, int padding)
+static int pkcs11_rsa_decrypt(int flen, const unsigned char *from,
+		unsigned char *to, RSA * rsa, int padding)
 {
 
 	return PKCS11_private_decrypt(	flen, from, to, (PKCS11_KEY *) RSA_get_app_data(rsa), padding);
 }
 
-static int
-pkcs11_rsa_encrypt(int flen, const unsigned char *from, unsigned char *to,
-		   RSA * rsa, int padding)
+static int pkcs11_rsa_encrypt(int flen, const unsigned char *from,
+		unsigned char *to, RSA * rsa, int padding)
 {
 	return PKCS11_private_encrypt(flen,from,to,(PKCS11_KEY *) RSA_get_app_data(rsa), padding);
 }
 
-static int
-pkcs11_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
+static int pkcs11_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
 		unsigned char *sigret, unsigned int *siglen, const RSA * rsa)
 {
 	
diff --git a/src/p11_slot.c b/src/p11_slot.c
index d30335f..0ebaf8a 100644
--- a/src/p11_slot.c
+++ b/src/p11_slot.c
@@ -290,7 +290,7 @@ int PKCS11_generate_random(PKCS11_SLOT *slot, unsigned char *r,
 /*
  * Helper functions
  */
-int pkcs11_init_slot(PKCS11_CTX * ctx, PKCS11_SLOT * slot, CK_SLOT_ID id)
+static int pkcs11_init_slot(PKCS11_CTX * ctx, PKCS11_SLOT * slot, CK_SLOT_ID id)
 {
 	PKCS11_SLOT_private *priv;
 	CK_SLOT_INFO info;
@@ -338,7 +338,7 @@ void pkcs11_release_slot(PKCS11_CTX * ctx, PKCS11_SLOT * slot)
 	memset(slot, 0, sizeof(*slot));
 }
 
-int pkcs11_check_token(PKCS11_CTX * ctx, PKCS11_SLOT * slot)
+static int pkcs11_check_token(PKCS11_CTX * ctx, PKCS11_SLOT * slot)
 {
 	PKCS11_SLOT_private *priv = PRIVSLOT(slot);
 	PKCS11_TOKEN_private *tpriv;
@@ -380,7 +380,7 @@ int pkcs11_check_token(PKCS11_CTX * ctx, PKCS11_SLOT * slot)
 	return 0;
 }
 
-void pkcs11_destroy_token(PKCS11_TOKEN * token)
+static void pkcs11_destroy_token(PKCS11_TOKEN * token)
 {
 	pkcs11_destroy_keys(token);
 	pkcs11_destroy_certs(token);

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