Date: Thu, 19 Dec 2002 06:15:50 -0800 (PST) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22513 for review Message-ID: <200212191415.gBJEFou2081669@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22513 Change 22513 by des@des.at.des.thinksec.com on 2002/12/19 06:15:13 Ages-old uncommitted changes: restructure the protocol stack, reorganize the headers. Still doesn't work, though. Sponsored by: DARPA, NAI Labs Affected files ... .. //depot/projects/cryptoki/lib/C_CancelFunction.c#5 edit .. //depot/projects/cryptoki/lib/C_CloseAllSessions.c#5 edit .. //depot/projects/cryptoki/lib/C_CloseSession.c#5 edit .. //depot/projects/cryptoki/lib/C_CopyObject.c#5 edit .. //depot/projects/cryptoki/lib/C_CreateObject.c#5 edit .. //depot/projects/cryptoki/lib/C_Decrypt.c#5 edit .. //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_DecryptFinal.c#5 edit .. //depot/projects/cryptoki/lib/C_DecryptInit.c#5 edit .. //depot/projects/cryptoki/lib/C_DecryptUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_DeriveKey.c#5 edit .. //depot/projects/cryptoki/lib/C_DestroyObject.c#5 edit .. //depot/projects/cryptoki/lib/C_Digest.c#5 edit .. //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_DigestFinal.c#5 edit .. //depot/projects/cryptoki/lib/C_DigestInit.c#5 edit .. //depot/projects/cryptoki/lib/C_DigestKey.c#5 edit .. //depot/projects/cryptoki/lib/C_DigestUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_Encrypt.c#5 edit .. //depot/projects/cryptoki/lib/C_EncryptFinal.c#5 edit .. //depot/projects/cryptoki/lib/C_EncryptInit.c#5 edit .. //depot/projects/cryptoki/lib/C_EncryptUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_Finalize.c#5 edit .. //depot/projects/cryptoki/lib/C_FindObjects.c#5 edit .. //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#5 edit .. //depot/projects/cryptoki/lib/C_FindObjectsInit.c#5 edit .. //depot/projects/cryptoki/lib/C_GenerateKey.c#5 edit .. //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#5 edit .. //depot/projects/cryptoki/lib/C_GenerateRandom.c#5 edit .. //depot/projects/cryptoki/lib/C_GetAttributeValue.c#5 edit .. //depot/projects/cryptoki/lib/C_GetFunctionList.c#6 edit .. //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#5 edit .. //depot/projects/cryptoki/lib/C_GetInfo.c#5 edit .. //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#5 edit .. //depot/projects/cryptoki/lib/C_GetMechanismList.c#5 edit .. //depot/projects/cryptoki/lib/C_GetObjectSize.c#5 edit .. //depot/projects/cryptoki/lib/C_GetOperationState.c#5 edit .. //depot/projects/cryptoki/lib/C_GetSessionInfo.c#5 edit .. //depot/projects/cryptoki/lib/C_GetSlotInfo.c#8 edit .. //depot/projects/cryptoki/lib/C_GetSlotList.c#6 edit .. //depot/projects/cryptoki/lib/C_GetTokenInfo.c#6 edit .. //depot/projects/cryptoki/lib/C_InitPIN.c#5 edit .. //depot/projects/cryptoki/lib/C_InitToken.c#5 edit .. //depot/projects/cryptoki/lib/C_Initialize.c#6 edit .. //depot/projects/cryptoki/lib/C_Login.c#5 edit .. //depot/projects/cryptoki/lib/C_Logout.c#5 edit .. //depot/projects/cryptoki/lib/C_OpenSession.c#5 edit .. //depot/projects/cryptoki/lib/C_SeedRandom.c#5 edit .. //depot/projects/cryptoki/lib/C_SetAttributeValue.c#5 edit .. //depot/projects/cryptoki/lib/C_SetOperationState.c#5 edit .. //depot/projects/cryptoki/lib/C_SetPIN.c#5 edit .. //depot/projects/cryptoki/lib/C_Sign.c#5 edit .. //depot/projects/cryptoki/lib/C_SignEncryptUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_SignFinal.c#5 edit .. //depot/projects/cryptoki/lib/C_SignInit.c#5 edit .. //depot/projects/cryptoki/lib/C_SignRecover.c#5 edit .. //depot/projects/cryptoki/lib/C_SignRecoverInit.c#5 edit .. //depot/projects/cryptoki/lib/C_SignUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_UnwrapKey.c#5 edit .. //depot/projects/cryptoki/lib/C_Verify.c#5 edit .. //depot/projects/cryptoki/lib/C_VerifyFinal.c#5 edit .. //depot/projects/cryptoki/lib/C_VerifyInit.c#5 edit .. //depot/projects/cryptoki/lib/C_VerifyRecover.c#5 edit .. //depot/projects/cryptoki/lib/C_VerifyRecoverInit.c#5 edit .. //depot/projects/cryptoki/lib/C_VerifyUpdate.c#5 edit .. //depot/projects/cryptoki/lib/C_WaitForSlotEvent.c#5 edit .. //depot/projects/cryptoki/lib/C_WrapKey.c#5 edit .. //depot/projects/cryptoki/lib/Makefile#7 edit .. //depot/projects/cryptoki/lib/_ck_apdu.c#2 edit .. //depot/projects/cryptoki/lib/_ck_assert.c#1 add .. //depot/projects/cryptoki/lib/_ck_configure.c#3 edit .. //depot/projects/cryptoki/lib/_ck_crc.c#2 edit .. //depot/projects/cryptoki/lib/_ck_debug.c#1 add .. //depot/projects/cryptoki/lib/_ck_debug.h#1 add .. //depot/projects/cryptoki/lib/_ck_global.c#2 edit .. //depot/projects/cryptoki/lib/_ck_hexdump.c#2 edit .. //depot/projects/cryptoki/lib/_ck_impl.h#1 add .. //depot/projects/cryptoki/lib/_ck_object.c#2 edit .. //depot/projects/cryptoki/lib/_ck_parallel.c#2 edit .. //depot/projects/cryptoki/lib/_ck_serial.c#2 edit .. //depot/projects/cryptoki/lib/_ck_session.h#1 add .. //depot/projects/cryptoki/lib/_ck_session_delete.c#2 edit .. //depot/projects/cryptoki/lib/_ck_session_find.c#2 edit .. //depot/projects/cryptoki/lib/_ck_session_new.c#2 edit .. //depot/projects/cryptoki/lib/_ck_slot_open.c#1 add .. //depot/projects/cryptoki/lib/_ck_token.h#1 add .. //depot/projects/cryptoki/lib/_ck_token_get.c#1 add .. //depot/projects/cryptoki/lib/_ck_tpdu.h#1 add .. //depot/projects/cryptoki/lib/_ck_tpdu_t0.c#2 edit .. //depot/projects/cryptoki/lib/_ck_tpdu_t1.c#2 edit .. //depot/projects/cryptoki/lib/_ck_ugen.c#2 edit .. //depot/projects/cryptoki/lib/_ck_usb.c#2 edit .. //depot/projects/cryptoki/lib/cryptoki_impl.h#5 delete .. //depot/projects/cryptoki/lib/panic.c#1 add Differences ... ==== //depot/projects/cryptoki/lib/C_CancelFunction.c#5 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CancelFunction.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_CancelFunction.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession) ==== //depot/projects/cryptoki/lib/C_CloseAllSessions.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CloseAllSessions.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseAllSessions.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_slot.h" CK_RV C_CloseAllSessions(CK_SLOT_ID slotID) ==== //depot/projects/cryptoki/lib/C_CloseSession.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CloseSession.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseSession.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) ==== //depot/projects/cryptoki/lib/C_CopyObject.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CopyObject.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_CopyObject.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_CreateObject.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CreateObject.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_CreateObject.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_Decrypt.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Decrypt.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_Decrypt.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DecryptFinal.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptFinal.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptFinal.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DecryptInit.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptInit.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptInit.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DecryptUpdate.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptUpdate.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptUpdate.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DeriveKey.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DeriveKey.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DeriveKey.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DeriveKey(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DestroyObject.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DestroyObject.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DestroyObject.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_Digest.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Digest.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_Digest.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_Digest(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DigestFinal.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestFinal.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestFinal.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DigestInit.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestInit.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestInit.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DigestKey.c#5 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestKey.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestKey.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_DigestUpdate.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestUpdate.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestUpdate.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_Encrypt.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Encrypt.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_Encrypt.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_EncryptFinal.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_EncryptFinal.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptFinal.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_EncryptInit.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_EncryptInit.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptInit.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_EncryptUpdate.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_EncryptUpdate.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptUpdate.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_Finalize.c#5 (text+ko) ==== @@ -31,19 +31,23 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Finalize.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_Finalize.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_slot.h" CK_RV C_Finalize(CK_VOID_PTR pReserved) { + CK_ULONG i; if (!_ck_Initialized) return (CKR_CRYPTOKI_NOT_INITIALIZED); if (pReserved != NULL_PTR) return (CKR_ARGUMENTS_BAD); + for (i = 0; i < _ck_NumSlots; ++i) + _ck_Slots[i].cks_driver->close(&_ck_Slots[i], 0); _ck_Initialized = FALSE; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_FindObjects.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_FindObjects.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjects.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession) ==== //depot/projects/cryptoki/lib/C_FindObjectsInit.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_FindObjectsInit.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsInit.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GenerateKey.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GenerateKey.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKey.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_GenerateKeyPair(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GenerateRandom.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GenerateRandom.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateRandom.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_GenerateRandom(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GetAttributeValue.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetAttributeValue.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetAttributeValue.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GetFunctionList.c#6 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetFunctionList.c#5 $ + * $P4: //depot/projects/cryptoki/lib/C_GetFunctionList.c#6 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) ==== //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#5 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" CK_RV C_GetFunctionStatus(CK_SESSION_HANDLE hSession) ==== //depot/projects/cryptoki/lib/C_GetInfo.c#5 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetInfo.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetInfo.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" CK_RV C_GetInfo(CK_INFO_PTR pInfo) ==== //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_slot.h" CK_RV C_GetMechanismInfo(CK_SLOT_ID slotID, ==== //depot/projects/cryptoki/lib/C_GetMechanismList.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetMechanismList.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetMechanismList.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_slot.h" CK_RV C_GetMechanismList(CK_SLOT_ID slotID, ==== //depot/projects/cryptoki/lib/C_GetObjectSize.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetObjectSize.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetObjectSize.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_GetObjectSize(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GetOperationState.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetOperationState.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetOperationState.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_GetOperationState(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GetSessionInfo.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetSessionInfo.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSessionInfo.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_GetSlotInfo.c#8 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#7 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#8 $ */ #include <string.h> -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_slot.h" CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, @@ -51,6 +52,8 @@ return (CKR_ARGUMENTS_BAD); slot = &_ck_Slots[slotID]; memset(pInfo, 0, sizeof *pInfo); - ret = _ck_call(sinfo, slot->cks_stack, pInfo); + if (_ck_slot_open(slot) != 0) + return (CKR_GENERAL_ERROR); + ret = slot->cks_driver->info(slot, pInfo); return (ret == 0 ? CKR_OK : CKR_GENERAL_ERROR /* XXX */); } ==== //depot/projects/cryptoki/lib/C_GetSlotList.c#6 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetSlotList.c#5 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotList.c#6 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_slot.h" CK_RV C_GetSlotList(CK_BBOOL tokenPresent, ==== //depot/projects/cryptoki/lib/C_GetTokenInfo.c#6 (text+ko) ==== @@ -31,20 +31,31 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetTokenInfo.c#5 $ + * $P4: //depot/projects/cryptoki/lib/C_GetTokenInfo.c#6 $ */ -#include "cryptoki_impl.h" +#include <string.h> + +#include "_ck_impl.h" +#include "_ck_slot.h" +#include "_ck_token.h" CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) { + _ck_slot_ptr slot; + _ck_token_ptr token; + int ret; if (!_ck_Initialized) return (CKR_CRYPTOKI_NOT_INITIALIZED); if (pInfo == NULL_PTR || slotID > _ck_NumSlots) return (CKR_ARGUMENTS_BAD); - - return (CKR_TOKEN_NOT_PRESENT); + slot = &_ck_Slots[slotID]; + if ((token = _ck_token_get(slot)) == NULL) + return (CKR_TOKEN_NOT_PRESENT); + memset(pInfo, 0, sizeof *pInfo); + ret = token->ckt_driver->info(token, pInfo); + return (ret == 0 ? CKR_OK : CKR_GENERAL_ERROR /* XXX */); } ==== //depot/projects/cryptoki/lib/C_InitPIN.c#5 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_InitPIN.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_InitPIN.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_InitToken.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_InitToken.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_InitToken.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_slot.h" CK_RV C_InitToken(CK_SLOT_ID slotID, ==== //depot/projects/cryptoki/lib/C_Initialize.c#6 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Initialize.c#5 $ + * $P4: //depot/projects/cryptoki/lib/C_Initialize.c#6 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_misc.h" CK_RV C_Initialize(CK_VOID_PTR pInitArgs) ==== //depot/projects/cryptoki/lib/C_Login.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Login.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_Login.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_Login(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_Logout.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Logout.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_Logout.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_Logout(CK_SESSION_HANDLE hSession) ==== //depot/projects/cryptoki/lib/C_OpenSession.c#5 (text+ko) ==== @@ -31,10 +31,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_OpenSession.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_OpenSession.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" +#include "_ck_slot.h" CK_RV C_OpenSession(CK_SLOT_ID slotID, ==== //depot/projects/cryptoki/lib/C_SeedRandom.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_SeedRandom.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_SeedRandom.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_SeedRandom(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_SetAttributeValue.c#5 (text+ko) ==== @@ -31,10 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_SetAttributeValue.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_SetAttributeValue.c#5 $ */ -#include "cryptoki_impl.h" +#include "_ck_impl.h" +#include "_ck_session.h" CK_RV C_SetAttributeValue(CK_SESSION_HANDLE hSession, ==== //depot/projects/cryptoki/lib/C_SetOperationState.c#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212191415.gBJEFou2081669>