This allows all the tokens to have the same name for the
initialisation function.
---
usr/lib/pkcs11/leeds_stdll/host_api.c | 12 ++++++------
usr/sbin/pkcs_slot/pkcs_slot.in | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/usr/lib/pkcs11/leeds_stdll/host_api.c
b/usr/lib/pkcs11/leeds_stdll/host_api.c
index 6a0541a..3bceca7 100644
--- a/usr/lib/pkcs11/leeds_stdll/host_api.c
+++ b/usr/lib/pkcs11/leeds_stdll/host_api.c
@@ -550,7 +550,7 @@ struct Cor_init{
struct ST_FCN_LIST function_list;
- extern CK_RV SC_Initialize(); /* extern
CK_RV SC_Initialize */
+ extern CK_RV ST_Initialize(); /* extern
CK_RV ST_Initialize */
extern CK_RV SC_GetTokenInfo(); /* extern
CK_RV SC_GetTokenInfo */
extern CK_RV SC_GetMechanismList(); /* extern
CK_RV SC_GetMechanismList */
extern CK_RV SC_GetMechanismInfo(); /* extern
CK_RV SC_GetMechanismInfo */
@@ -618,7 +618,7 @@ struct ST_FCN_LIST function_list;
void
SC_SetFunctionList(void){
- function_list.ST_Initialize = SC_Initialize;
+ function_list.ST_Initialize = ST_Initialize;
function_list.ST_GetTokenInfo = SC_GetTokenInfo;
function_list.ST_GetMechanismList = SC_GetMechanismList;
function_list.ST_GetMechanismInfo = SC_GetMechanismInfo;
@@ -1486,7 +1486,7 @@ error:
//
//
-CK_RV SC_Initialize( void **FunctionList,
+CK_RV ST_Initialize( void **FunctionList,
CK_SLOT_ID SlotNumber,
char *Correlator)
{
@@ -1600,7 +1600,7 @@ CK_RV SC_Initialize( void **FunctionList,
rc = 0;
#ifndef ALLSOCK
#ifdef DEBUGON
- logit(LOG_DEBUG, "%-25s: slot_id %d, \n","SC_Initialize",i);
+ logit(LOG_DEBUG, "%-25s: slot_id %d, \n","ST_Initialize",i);
#endif
{
int j;
@@ -1620,7 +1620,7 @@ rc = 0;
if ( connect (adapter_handle[i],(struct sockaddr
*)&saddr,sizeof(struct sockaddr_in)) < 0 ){
// XXX FIXME just bail for now.
#ifdef DEBUGON
- logit(LOG_DEBUG, "%-25s: connect errno %d \n","SC_Initialize",errno);
+ logit(LOG_DEBUG, "%-25s: connect errno %d \n","ST_Initialize",errno);
#endif
ReleaseMutex(pkcs_mutex);
return CKR_FUNCTION_FAILED;
@@ -1630,7 +1630,7 @@ rc = 0;
} else {
#ifdef DEBUGON
- logit(LOG_DEBUG, "%-25s: open errno %d \n","SC_Initialize",errno);
+ logit(LOG_DEBUG, "%-25s: open errno %d \n","ST_Initialize",errno);
#endif
ReleaseMutex(pkcs_mutex);
return CKR_FUNCTION_FAILED;
diff --git a/usr/sbin/pkcs_slot/pkcs_slot.in b/usr/sbin/pkcs_slot/pkcs_slot.in
index 900ed92..db31871 100644
--- a/usr/sbin/pkcs_slot/pkcs_slot.in
+++ b/usr/sbin/pkcs_slot/pkcs_slot.in
@@ -300,7 +300,7 @@
DEEP4758_DLL="@libdir@/opencryptoki/stdll/PKCS11_4758.so"
DEEP4758_DLL_FN="PKCS11_4758.so"
-DEEP4758_INIT="SC_Initialize"
+DEEP4758_INIT="ST_Initialize"
SOFT_DIR="@localstatedir@/lib/opencryptoki/swtok"
SOFT_DLL="@libdir@/opencryptoki/stdll/libpkcs11_sw.so"
--
1.7.5.rc1
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Opencryptoki-tech mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
