mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-14 18:51:28 +00:00
Fix for 129201 - allow parameter string to be retrieved in a PKCS#11 module built on top of ckfw
This commit is contained in:
parent
cb7802266b
commit
524157740c
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.4 $ $Date: 2002/02/13 02:26:45 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.5 $ $Date: 2002/03/06 21:41:34 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
@ -58,6 +58,7 @@ static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.4 $ $Da
|
||||
* NSSCKFWInstance_MayCreatePthreads
|
||||
* NSSCKFWInstance_CreateMutex
|
||||
* NSSCKFWInstance_GetConfigurationData
|
||||
* NSSCKFWInstance_GetInitArgs
|
||||
*
|
||||
* -- implement public accessors --
|
||||
* nssCKFWInstance_GetMDInstance
|
||||
@ -65,6 +66,7 @@ static const char CVS_ID[] = "@(#) $RCSfile: instance.c,v $ $Revision: 1.4 $ $Da
|
||||
* nssCKFWInstance_MayCreatePthreads
|
||||
* nssCKFWInstance_CreateMutex
|
||||
* nssCKFWInstance_GetConfigurationData
|
||||
* nssCKFWInstance_GetInitArgs
|
||||
*
|
||||
* -- private accessors --
|
||||
* nssCKFWInstance_CreateSessionHandle
|
||||
@ -520,6 +522,25 @@ nssCKFWInstance_GetConfigurationData
|
||||
return fwInstance->configurationData;
|
||||
}
|
||||
|
||||
/*
|
||||
* nssCKFWInstance_GetInitArgs
|
||||
*
|
||||
*/
|
||||
CK_C_INITIALIZE_ARGS_PTR
|
||||
nssCKFWInstance_GetInitArgs
|
||||
(
|
||||
NSSCKFWInstance *fwInstance
|
||||
)
|
||||
{
|
||||
#ifdef NSSDEBUG
|
||||
if( CKR_OK != nssCKFWInstance_verifyPointer(fwInstance) ) {
|
||||
return (CK_C_INITIALIZE_ARGS_PTR)NULL;
|
||||
}
|
||||
#endif /* NSSDEBUG */
|
||||
|
||||
return fwInstance->pInitArgs;
|
||||
}
|
||||
|
||||
/*
|
||||
* nssCKFWInstance_CreateSessionHandle
|
||||
*
|
||||
@ -1304,3 +1325,23 @@ NSSCKFWInstance_GetConfigurationData
|
||||
|
||||
return nssCKFWInstance_GetConfigurationData(fwInstance);
|
||||
}
|
||||
|
||||
/*
|
||||
* NSSCKFWInstance_GetInitArgs
|
||||
*
|
||||
*/
|
||||
NSS_IMPLEMENT CK_C_INITIALIZE_ARGS_PTR
|
||||
NSSCKFWInstance_GetInitArgs
|
||||
(
|
||||
NSSCKFWInstance *fwInstance
|
||||
)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
if( CKR_OK != nssCKFWInstance_verifyPointer(fwInstance) ) {
|
||||
return (CK_C_INITIALIZE_ARGS_PTR)NULL;
|
||||
}
|
||||
#endif /* DEBUG */
|
||||
|
||||
return nssCKFWInstance_GetInitArgs(fwInstance);
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
#define NSSCKFW_H
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char NSSCKFW_CVS_ID[] = "@(#) $RCSfile: nssckfw.h,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:43:26 $ $Name: $";
|
||||
static const char NSSCKFW_CVS_ID[] = "@(#) $RCSfile: nssckfw.h,v $ $Revision: 1.2 $ $Date: 2002/03/06 21:41:35 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
@ -125,6 +125,17 @@ NSSCKFWInstance_GetConfigurationData
|
||||
NSSCKFWInstance *fwInstance
|
||||
);
|
||||
|
||||
/*
|
||||
* NSSCKFWInstance_GetInitArgs
|
||||
*
|
||||
*/
|
||||
|
||||
NSS_EXTERN CK_C_INITIALIZE_ARGS_PTR
|
||||
NSSCKFWInstance_GetInitArgs
|
||||
(
|
||||
NSSCKFWInstance *fwInstance
|
||||
);
|
||||
|
||||
/*
|
||||
* NSSCKFWSlot
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user