diff options
| author | jpierre%netscape.com <devnull@localhost> | 2002-03-06 21:41:35 +0000 |
|---|---|---|
| committer | jpierre%netscape.com <devnull@localhost> | 2002-03-06 21:41:35 +0000 |
| commit | 3a8c2f07150c30185f58bf66713288d5a6fbeb0e (patch) | |
| tree | 49f0a62dec37695911d09ef457ec7a34032e12e2 /security/nss/lib/ckfw | |
| parent | 7e0e5740e1da4b8bedb3af8e77475da229b4f0a6 (diff) | |
| download | nss-hg-3a8c2f07150c30185f58bf66713288d5a6fbeb0e.tar.gz | |
Fix for 129201 - allow parameter string to be retrieved in a PKCS#11 module built on top of ckfw
Diffstat (limited to 'security/nss/lib/ckfw')
| -rw-r--r-- | security/nss/lib/ckfw/instance.c | 41 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/nssckfw.h | 11 |
2 files changed, 52 insertions, 0 deletions
diff --git a/security/nss/lib/ckfw/instance.c b/security/nss/lib/ckfw/instance.c index 02a73e224..42b8b11ab 100644 --- a/security/nss/lib/ckfw/instance.c +++ b/security/nss/lib/ckfw/instance.c @@ -58,6 +58,7 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$"; * NSSCKFWInstance_MayCreatePthreads * NSSCKFWInstance_CreateMutex * NSSCKFWInstance_GetConfigurationData + * NSSCKFWInstance_GetInitArgs * * -- implement public accessors -- * nssCKFWInstance_GetMDInstance @@ -65,6 +66,7 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$"; * nssCKFWInstance_MayCreatePthreads * nssCKFWInstance_CreateMutex * nssCKFWInstance_GetConfigurationData + * nssCKFWInstance_GetInitArgs * * -- private accessors -- * nssCKFWInstance_CreateSessionHandle @@ -521,6 +523,25 @@ nssCKFWInstance_GetConfigurationData } /* + * 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); +} + diff --git a/security/nss/lib/ckfw/nssckfw.h b/security/nss/lib/ckfw/nssckfw.h index ce16f2b7b..769427ab6 100644 --- a/security/nss/lib/ckfw/nssckfw.h +++ b/security/nss/lib/ckfw/nssckfw.h @@ -126,6 +126,17 @@ NSSCKFWInstance_GetConfigurationData ); /* + * NSSCKFWInstance_GetInitArgs + * + */ + +NSS_EXTERN CK_C_INITIALIZE_ARGS_PTR +NSSCKFWInstance_GetInitArgs +( + NSSCKFWInstance *fwInstance +); + +/* * NSSCKFWSlot * * NSSCKFWSlot_GetMDSlot |