giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unreachable code, make some functions static and fix parameter type 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2136 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
nils 2005-02-04 22:33:51 +00:00
parent f2cf81ba19
commit e0c1b6e8f1
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/pkcs11-tool.c
View File

@ -762,9 +762,6 @@ sign_data(CK_SLOT_ID slot, CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key)
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignUpdate", rv); p11_fatal("C_SignUpdate", rv);
} }
if (rv < 0)
fatal("failed to read from %s: %m",
opt_input? opt_input : "<stdin>");
if (fd != 0) if (fd != 0)
close(fd); close(fd);
@ -824,9 +821,7 @@ hash_data(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_DigestUpdate", rv); p11_fatal("C_DigestUpdate", rv);
} }
if (rv < 0)
fatal("failed to read from %s: %m",
opt_input? opt_input : "<stdin>");
if (fd != 0) if (fd != 0)
close(fd); close(fd);
@ -1134,7 +1129,7 @@ find_mechanism(CK_SLOT_ID slot, CK_FLAGS flags, int stop_if_not_found)
#define ATTR_METHOD(ATTR, TYPE) \ #define ATTR_METHOD(ATTR, TYPE) \
TYPE \ static TYPE \
get##ATTR(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj) \ get##ATTR(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj) \
{ \ { \
TYPE type; \ TYPE type; \
@ -1148,7 +1143,7 @@ get##ATTR(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj) \
} }
#define VARATTR_METHOD(ATTR, TYPE) \ #define VARATTR_METHOD(ATTR, TYPE) \
TYPE * \ static TYPE * \
get##ATTR(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj, CK_ULONG_PTR pulCount) \ get##ATTR(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj, CK_ULONG_PTR pulCount) \
{ \ { \
CK_ATTRIBUTE attr = { CKA_##ATTR, NULL, 0 }; \ CK_ATTRIBUTE attr = { CKA_##ATTR, NULL, 0 }; \
@ -1683,7 +1678,7 @@ test_digest(CK_SLOT_ID slot)
} }
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
EVP_PKEY *get_public_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE privKeyObject) static EVP_PKEY *get_public_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE privKeyObject)
{ {
unsigned char *id; unsigned char *id;
CK_ULONG idLen; CK_ULONG idLen;
@ -1726,11 +1721,11 @@ EVP_PKEY *get_public_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE privKeyObje
} }
#endif #endif
int sign_verify_openssl(CK_SLOT_ID slot, CK_SESSION_HANDLE session, static int sign_verify_openssl(CK_SLOT_ID slot, CK_SESSION_HANDLE session,
CK_MECHANISM *ck_mech, CK_OBJECT_HANDLE privKeyObject, CK_MECHANISM *ck_mech, CK_OBJECT_HANDLE privKeyObject,
unsigned char *data, CK_ULONG dataLen, unsigned char *data, CK_ULONG dataLen,
unsigned char *verifyData, CK_ULONG verifyDataLen, unsigned char *verifyData, CK_ULONG verifyDataLen,
int modLenBytes, int evp_md_index) CK_ULONG modLenBytes, int evp_md_index)
{ {
int errors = 0; int errors = 0;
CK_RV rv; CK_RV rv;