Signed-off-by: Harald Freudenberger <[email protected]>
---
usr/include/pkcs11/stdll.h | 5 +++--
usr/lib/pkcs11/api/api_interface.c | 3 +--
usr/lib/pkcs11/ep11_stdll/ep11_specific.c | 6 +++---
usr/lib/pkcs11/ica_stdll/ica_specific.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/usr/include/pkcs11/stdll.h b/usr/include/pkcs11/stdll.h
index 39e6e7a..ab3379a 100755
--- a/usr/include/pkcs11/stdll.h
+++ b/usr/include/pkcs11/stdll.h
@@ -327,8 +327,9 @@ typedef ST_SESSION_T ST_SESSION_HANDLE;
typedef CK_RV (CK_PTR ST_C_Initialize)
- (void **ppFunctionList,CK_SLOT_ID slotID,CK_CHAR_PTR pCorrelator,
- CK_CHAR_PTR pConfName);
+ (void **ppFunctionList,
+ CK_SLOT_ID slotID,
+ CK_CHAR_PTR pConfName);
typedef CK_RV (CK_PTR ST_C_Finalize)
(CK_VOID_PTR pReserved);
diff --git a/usr/lib/pkcs11/api/api_interface.c
b/usr/lib/pkcs11/api/api_interface.c
index d4702b0..a028c0a 100755
--- a/usr/lib/pkcs11/api/api_interface.c
+++ b/usr/lib/pkcs11/api/api_interface.c
@@ -2893,8 +2893,7 @@ CK_RV C_Initialize(CK_VOID_PTR pVoid)
// Right now the library DOES NOT create threads and therefore
this
// check is irrelavant.
if (pArg->flags & CKF_LIBRARY_CANT_CREATE_OS_THREADS) {
- OCK_LOG_DEBUG
- ("Can't create OS threads.... This is OK\n");
+ OCK_LOG_DEBUG("Can't create OS threads.... This is
OK\n");
}
// Since this is an initialization path, we will be verbose in
the
// code rather than efficient.
diff --git a/usr/lib/pkcs11/ep11_stdll/ep11_specific.c
b/usr/lib/pkcs11/ep11_stdll/ep11_specific.c
index 09fa48a..c2ea52c 100644
--- a/usr/lib/pkcs11/ep11_stdll/ep11_specific.c
+++ b/usr/lib/pkcs11/ep11_stdll/ep11_specific.c
@@ -331,13 +331,13 @@ static FILE *EP11Tok_logfile = NULL;
#define EP11TOK_LOG(_loglevel, _format, ...) {
\
if (EP11Tok_loglevel >= _loglevel && EP11Tok_logfile) {
\
fprintf(EP11Tok_logfile, "%s " _format "\n", __func__, ##
__VA_ARGS__); \
- ock_logit("EP11_TOK DEBUG %s " _format, __func__, ## __VA_ARGS__);
}}
+ ock_logit("EP11_TOK DEBUG %s " _format "\n", __func__, ##
__VA_ARGS__); }}
#define EP11TOK_ELOG(_loglevel, _format, ...) {
\
if (EP11Tok_loglevel >= _loglevel && EP11Tok_logfile) {
\
fprintf(EP11Tok_logfile, "ERROR: %s " _format "\n", __func__, ##
__VA_ARGS__); \
OCK_SYSLOG(LOG_ERR, _format, ## __VA_ARGS__);
\
- ock_logit("EP11_TOK ERROR %s " _format, __func__, ## __VA_ARGS__);
}}
+ ock_logit("EP11_TOK ERROR %s " _format "\n", __func__, ##
__VA_ARGS__); }}
#define EP11TOK_DUMP(_loglevel, _text, _buf, _buflen) { \
if (EP11Tok_loglevel >= _loglevel && EP11Tok_logfile) { \
@@ -346,7 +346,7 @@ static FILE *EP11Tok_logfile = NULL;
sprintf(str+2*i, "%02hhx", ((unsigned char*)(_buf))[i]); \
*(str+2*i+2) = '\0'; } \
fprintf(EP11Tok_logfile, _text " %s\n", str); \
- ock_logit("EP11_TOK DEBUG " _text " %s", str); }}
+ ock_logit("EP11_TOK DEBUG " _text " %s\n", str); }}
CK_CHAR manuf[] = "IBM Corp.";
diff --git a/usr/lib/pkcs11/ica_stdll/ica_specific.c
b/usr/lib/pkcs11/ica_stdll/ica_specific.c
index 8f7f2e1..ee7aa0b 100755
--- a/usr/lib/pkcs11/ica_stdll/ica_specific.c
+++ b/usr/lib/pkcs11/ica_stdll/ica_specific.c
@@ -358,7 +358,7 @@ tok_slot2local(CK_SLOT_ID snum)
}
CK_RV
-token_specific_init(char * Correlator,CK_SLOT_ID SlotNumber)
+token_specific_init(CK_SLOT_ID SlotNumber, char *conf_name)
{
return icaOpenAdapter(0,&adapter_handle);
--
1.7.9.5
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
