diff options
Diffstat (limited to 'nss/lib/ckfw/nssckfw.h')
| -rw-r--r-- | nss/lib/ckfw/nssckfw.h | 284 |
1 files changed, 128 insertions, 156 deletions
diff --git a/nss/lib/ckfw/nssckfw.h b/nss/lib/ckfw/nssckfw.h index 4343eab..0f93eaa 100644 --- a/nss/lib/ckfw/nssckfw.h +++ b/nss/lib/ckfw/nssckfw.h @@ -8,7 +8,7 @@ /* * nssckfw.h * - * This file prototypes the publicly available calls of the + * This file prototypes the publicly available calls of the * NSS Cryptoki Framework. */ @@ -32,6 +32,9 @@ * NSSCKFWInstance_MayCreatePthreads * NSSCKFWInstance_CreateMutex * NSSCKFWInstance_GetConfigurationData + * NSSCKFWInstance_GetInitArgs + * NSSCKFWInstance_DestroySessionHandle + * NSSCKFWInstance_FindSessionHandle */ /* @@ -40,10 +43,8 @@ */ NSS_EXTERN NSSCKMDInstance * -NSSCKFWInstance_GetMDInstance -( - NSSCKFWInstance *fwInstance -); +NSSCKFWInstance_GetMDInstance( + NSSCKFWInstance *fwInstance); /* * NSSCKFWInstance_GetArena @@ -51,11 +52,9 @@ NSSCKFWInstance_GetMDInstance */ NSS_EXTERN NSSArena * -NSSCKFWInstance_GetArena -( - NSSCKFWInstance *fwInstance, - CK_RV *pError -); +NSSCKFWInstance_GetArena( + NSSCKFWInstance *fwInstance, + CK_RV *pError); /* * NSSCKFWInstance_MayCreatePthreads @@ -63,10 +62,8 @@ NSSCKFWInstance_GetArena */ NSS_EXTERN CK_BBOOL -NSSCKFWInstance_MayCreatePthreads -( - NSSCKFWInstance *fwInstance -); +NSSCKFWInstance_MayCreatePthreads( + NSSCKFWInstance *fwInstance); /* * NSSCKFWInstance_CreateMutex @@ -74,12 +71,10 @@ NSSCKFWInstance_MayCreatePthreads */ NSS_EXTERN NSSCKFWMutex * -NSSCKFWInstance_CreateMutex -( - NSSCKFWInstance *fwInstance, - NSSArena *arena, - CK_RV *pError -); +NSSCKFWInstance_CreateMutex( + NSSCKFWInstance *fwInstance, + NSSArena *arena, + CK_RV *pError); /* * NSSCKFWInstance_GetConfigurationData @@ -87,10 +82,8 @@ NSSCKFWInstance_CreateMutex */ NSS_EXTERN NSSUTF8 * -NSSCKFWInstance_GetConfigurationData -( - NSSCKFWInstance *fwInstance -); +NSSCKFWInstance_GetConfigurationData( + NSSCKFWInstance *fwInstance); /* * NSSCKFWInstance_GetInitArgs @@ -98,10 +91,26 @@ NSSCKFWInstance_GetConfigurationData */ NSS_EXTERN CK_C_INITIALIZE_ARGS_PTR -NSSCKFWInstance_GetInitArgs -( - NSSCKFWInstance *fwInstance -); +NSSCKFWInstance_GetInitArgs( + NSSCKFWInstance *fwInstance); + +/* + * nssCKFWInstance_DestroySessionHandle + * + */ +NSS_EXTERN void +NSSCKFWInstance_DestroySessionHandle( + NSSCKFWInstance *fwInstance, + CK_SESSION_HANDLE hSession); + +/* + * nssCKFWInstance_FindSessionHandle + * + */ +NSS_EXTERN CK_SESSION_HANDLE +NSSCKFWInstance_FindSessionHandle( + NSSCKFWInstance *fwInstance, + NSSCKFWSession *fwSession); /* * NSSCKFWSlot @@ -109,6 +118,7 @@ NSSCKFWInstance_GetInitArgs * NSSCKFWSlot_GetMDSlot * NSSCKFWSlot_GetFWInstance * NSSCKFWSlot_GetMDInstance + * NSSCKFWSlot_GetSlotID * */ @@ -118,10 +128,8 @@ NSSCKFWInstance_GetInitArgs */ NSS_EXTERN NSSCKMDSlot * -NSSCKFWSlot_GetMDSlot -( - NSSCKFWSlot *fwSlot -); +NSSCKFWSlot_GetMDSlot( + NSSCKFWSlot *fwSlot); /* * NSSCKFWSlot_GetFWInstance @@ -129,10 +137,8 @@ NSSCKFWSlot_GetMDSlot */ NSS_EXTERN NSSCKFWInstance * -NSSCKFWSlot_GetFWInstance -( - NSSCKFWSlot *fwSlot -); +NSSCKFWSlot_GetFWInstance( + NSSCKFWSlot *fwSlot); /* * NSSCKFWSlot_GetMDInstance @@ -140,10 +146,17 @@ NSSCKFWSlot_GetFWInstance */ NSS_EXTERN NSSCKMDInstance * -NSSCKFWSlot_GetMDInstance -( - NSSCKFWSlot *fwSlot -); +NSSCKFWSlot_GetMDInstance( + NSSCKFWSlot *fwSlot); + +/* + * NSSCKFWSlot_GetSlotID + * + */ + +NSS_EXTERN CK_SLOT_ID +NSSCKFWSlot_GetSlotID( + NSSCKFWSlot *fwSlot); /* * NSSCKFWToken @@ -161,10 +174,8 @@ NSSCKFWSlot_GetMDInstance */ NSS_EXTERN NSSCKMDToken * -NSSCKFWToken_GetMDToken -( - NSSCKFWToken *fwToken -); +NSSCKFWToken_GetMDToken( + NSSCKFWToken *fwToken); /* * NSSCKFWToken_GetArena @@ -172,11 +183,9 @@ NSSCKFWToken_GetMDToken */ NSS_EXTERN NSSArena * -NSSCKFWToken_GetArena -( - NSSCKFWToken *fwToken, - CK_RV *pError -); +NSSCKFWToken_GetArena( + NSSCKFWToken *fwToken, + CK_RV *pError); /* * NSSCKFWToken_GetFWSlot @@ -184,10 +193,8 @@ NSSCKFWToken_GetArena */ NSS_EXTERN NSSCKFWSlot * -NSSCKFWToken_GetFWSlot -( - NSSCKFWToken *fwToken -); +NSSCKFWToken_GetFWSlot( + NSSCKFWToken *fwToken); /* * NSSCKFWToken_GetMDSlot @@ -195,10 +202,8 @@ NSSCKFWToken_GetFWSlot */ NSS_EXTERN NSSCKMDSlot * -NSSCKFWToken_GetMDSlot -( - NSSCKFWToken *fwToken -); +NSSCKFWToken_GetMDSlot( + NSSCKFWToken *fwToken); /* * NSSCKFWToken_GetSessionState @@ -206,10 +211,8 @@ NSSCKFWToken_GetMDSlot */ NSS_EXTERN CK_STATE -NSSCKFWToken_GetSessionState -( - NSSCKFWToken *fwToken -); +NSSCKFWToken_GetSessionState( + NSSCKFWToken *fwToken); /* * NSSCKFWMechanism @@ -225,10 +228,8 @@ NSSCKFWToken_GetSessionState */ NSS_EXTERN NSSCKMDMechanism * -NSSCKFWMechanism_GetMDMechanism -( - NSSCKFWMechanism *fwMechanism -); +NSSCKFWMechanism_GetMDMechanism( + NSSCKFWMechanism *fwMechanism); /* * NSSCKFWMechanism_GetParameter @@ -236,10 +237,8 @@ NSSCKFWMechanism_GetMDMechanism */ NSS_EXTERN NSSItem * -NSSCKFWMechanism_GetParameter -( - NSSCKFWMechanism *fwMechanism -); +NSSCKFWMechanism_GetParameter( + NSSCKFWMechanism *fwMechanism); /* * NSSCKFWSession @@ -250,6 +249,7 @@ NSSCKFWMechanism_GetParameter * NSSCKFWSession_IsRWSession * NSSCKFWSession_IsSO * NSSCKFWSession_GetCurrentCryptoOperation + * NSSCKFWSession_GetFWSlot * */ @@ -259,10 +259,8 @@ NSSCKFWMechanism_GetParameter */ NSS_EXTERN NSSCKMDSession * -NSSCKFWSession_GetMDSession -( - NSSCKFWSession *fwSession -); +NSSCKFWSession_GetMDSession( + NSSCKFWSession *fwSession); /* * NSSCKFWSession_GetArena @@ -270,11 +268,9 @@ NSSCKFWSession_GetMDSession */ NSS_EXTERN NSSArena * -NSSCKFWSession_GetArena -( - NSSCKFWSession *fwSession, - CK_RV *pError -); +NSSCKFWSession_GetArena( + NSSCKFWSession *fwSession, + CK_RV *pError); /* * NSSCKFWSession_CallNotification @@ -282,11 +278,9 @@ NSSCKFWSession_GetArena */ NSS_EXTERN CK_RV -NSSCKFWSession_CallNotification -( - NSSCKFWSession *fwSession, - CK_NOTIFICATION event -); +NSSCKFWSession_CallNotification( + NSSCKFWSession *fwSession, + CK_NOTIFICATION event); /* * NSSCKFWSession_IsRWSession @@ -294,10 +288,8 @@ NSSCKFWSession_CallNotification */ NSS_EXTERN CK_BBOOL -NSSCKFWSession_IsRWSession -( - NSSCKFWSession *fwSession -); +NSSCKFWSession_IsRWSession( + NSSCKFWSession *fwSession); /* * NSSCKFWSession_IsSO @@ -305,10 +297,8 @@ NSSCKFWSession_IsRWSession */ NSS_EXTERN CK_BBOOL -NSSCKFWSession_IsSO -( - NSSCKFWSession *fwSession -); +NSSCKFWSession_IsSO( + NSSCKFWSession *fwSession); /* * NSSCKFWSession_GetCurrentCryptoOperation @@ -316,11 +306,18 @@ NSSCKFWSession_IsSO */ NSS_EXTERN NSSCKFWCryptoOperation * -NSSCKFWSession_GetCurrentCryptoOperation -( - NSSCKFWSession *fwSession, - NSSCKFWCryptoOperationState state -); +NSSCKFWSession_GetCurrentCryptoOperation( + NSSCKFWSession *fwSession, + NSSCKFWCryptoOperationState state); + +/* + * NSSCKFWSession_GetFWSlot + * + */ + +NSS_EXTERN NSSCKFWSlot * +NSSCKFWSession_GetFWSlot( + NSSCKFWSession *fwSession); /* * NSSCKFWObject @@ -340,91 +337,75 @@ NSSCKFWSession_GetCurrentCryptoOperation * */ NSS_EXTERN NSSCKMDObject * -NSSCKFWObject_GetMDObject -( - NSSCKFWObject *fwObject -); +NSSCKFWObject_GetMDObject( + NSSCKFWObject *fwObject); /* * NSSCKFWObject_GetArena * */ NSS_EXTERN NSSArena * -NSSCKFWObject_GetArena -( - NSSCKFWObject *fwObject, - CK_RV *pError -); +NSSCKFWObject_GetArena( + NSSCKFWObject *fwObject, + CK_RV *pError); /* * NSSCKFWObject_IsTokenObject * */ NSS_EXTERN CK_BBOOL -NSSCKFWObject_IsTokenObject -( - NSSCKFWObject *fwObject -); +NSSCKFWObject_IsTokenObject( + NSSCKFWObject *fwObject); /* * NSSCKFWObject_GetAttributeCount * */ NSS_EXTERN CK_ULONG -NSSCKFWObject_GetAttributeCount -( - NSSCKFWObject *fwObject, - CK_RV *pError -); +NSSCKFWObject_GetAttributeCount( + NSSCKFWObject *fwObject, + CK_RV *pError); /* * NSSCKFWObject_GetAttributeTypes * */ NSS_EXTERN CK_RV -NSSCKFWObject_GetAttributeTypes -( - NSSCKFWObject *fwObject, - CK_ATTRIBUTE_TYPE_PTR typeArray, - CK_ULONG ulCount -); +NSSCKFWObject_GetAttributeTypes( + NSSCKFWObject *fwObject, + CK_ATTRIBUTE_TYPE_PTR typeArray, + CK_ULONG ulCount); /* * NSSCKFWObject_GetAttributeSize * */ NSS_EXTERN CK_ULONG -NSSCKFWObject_GetAttributeSize -( - NSSCKFWObject *fwObject, - CK_ATTRIBUTE_TYPE attribute, - CK_RV *pError -); +NSSCKFWObject_GetAttributeSize( + NSSCKFWObject *fwObject, + CK_ATTRIBUTE_TYPE attribute, + CK_RV *pError); /* * NSSCKFWObject_GetAttribute * */ NSS_EXTERN NSSItem * -NSSCKFWObject_GetAttribute -( - NSSCKFWObject *fwObject, - CK_ATTRIBUTE_TYPE attribute, - NSSItem *itemOpt, - NSSArena *arenaOpt, - CK_RV *pError -); +NSSCKFWObject_GetAttribute( + NSSCKFWObject *fwObject, + CK_ATTRIBUTE_TYPE attribute, + NSSItem *itemOpt, + NSSArena *arenaOpt, + CK_RV *pError); /* * NSSCKFWObject_GetObjectSize * */ NSS_EXTERN CK_ULONG -NSSCKFWObject_GetObjectSize -( - NSSCKFWObject *fwObject, - CK_RV *pError -); +NSSCKFWObject_GetObjectSize( + NSSCKFWObject *fwObject, + CK_RV *pError); /* * NSSCKFWFindObjects @@ -439,10 +420,8 @@ NSSCKFWObject_GetObjectSize */ NSS_EXTERN NSSCKMDFindObjects * -NSSCKFWFindObjects_GetMDFindObjects -( - NSSCKFWFindObjects * -); +NSSCKFWFindObjects_GetMDFindObjects( + NSSCKFWFindObjects *); /* * NSSCKFWMutex @@ -459,10 +438,8 @@ NSSCKFWFindObjects_GetMDFindObjects */ NSS_EXTERN CK_RV -NSSCKFWMutex_Destroy -( - NSSCKFWMutex *mutex -); +NSSCKFWMutex_Destroy( + NSSCKFWMutex *mutex); /* * NSSCKFWMutex_Lock @@ -470,10 +447,8 @@ NSSCKFWMutex_Destroy */ NSS_EXTERN CK_RV -NSSCKFWMutex_Lock -( - NSSCKFWMutex *mutex -); +NSSCKFWMutex_Lock( + NSSCKFWMutex *mutex); /* * NSSCKFWMutex_Unlock @@ -481,10 +456,7 @@ NSSCKFWMutex_Lock */ NSS_EXTERN CK_RV -NSSCKFWMutex_Unlock -( - NSSCKFWMutex *mutex -); +NSSCKFWMutex_Unlock( + NSSCKFWMutex *mutex); #endif /* NSSCKFW_H */ - |