ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '414-use-p11-kit-headers' into 'master'

Browse Source 
Resolve "Legal issue with pkcs11 headers"

Closes #414

See merge request isc-projects/bind9!2251
This commit is contained in:
Ondřej Surý
2019-09-16 09:22:33 -04:00
parent 3699545dac f6922d6e78
commit c3d684cf9e
8 changed files with 1796 additions and 3265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/isc/include/pkcs11/Makefile.in
View File

@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
# machine generated. The latter are handled specially in the
# install target below.
#
HEADERS = pkcs11f.h pkcs11.h pkcs11t.h eddsa.h
HEADERS = pkcs11.h eddsa.h
SUBDIRS =
TARGETS =

1963
lib/isc/include/pkcs11/pkcs11.h
View File

File diff suppressed because it is too large Load Diff

938
lib/isc/include/pkcs11/pkcs11f.h
View File

@@ -1,938 +0,0 @@
/*
* PKCS #11 Cryptographic Token Interface Base Specification Version 2.40 Errata 01
* Committee Specification Draft 01 / Public Review Draft 01
* 09 December 2015
* Copyright (c) OASIS Open 2015. All Rights Reserved.
* Source: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/errata01/csprd01/include/pkcs11-v2.40/
* Latest version of the specification: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
* https://www.oasis-open.org/policies-guidelines/ipr
*/
/* This header file contains pretty much everything about all the
* Cryptoki function prototypes. Because this information is
* used for more than just declaring function prototypes, the
* order of the functions appearing herein is important, and
* should not be altered.
*/
/* General-purpose */
/* C_Initialize initializes the Cryptoki library. */
CK_PKCS11_FUNCTION_INFO(C_Initialize)
#ifdef CK_NEED_ARG_LIST
(
CK_VOID_PTR pInitArgs /* if this is not NULL_PTR, it gets
* cast to CK_C_INITIALIZE_ARGS_PTR
* and dereferenced
*/
);
#endif
/* C_Finalize indicates that an application is done with the
* Cryptoki library.
*/
CK_PKCS11_FUNCTION_INFO(C_Finalize)
#ifdef CK_NEED_ARG_LIST
(
CK_VOID_PTR pReserved /* reserved. Should be NULL_PTR */
);
#endif
/* C_GetInfo returns general information about Cryptoki. */
CK_PKCS11_FUNCTION_INFO(C_GetInfo)
#ifdef CK_NEED_ARG_LIST
(
CK_INFO_PTR pInfo /* location that receives information */
);
#endif
/* C_GetFunctionList returns the function list. */
CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
#ifdef CK_NEED_ARG_LIST
(
CK_FUNCTION_LIST_PTR_PTR ppFunctionList /* receives pointer to
* function list
*/
);
#endif
/* Slot and token management */
/* C_GetSlotList obtains a list of slots in the system. */
CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
#ifdef CK_NEED_ARG_LIST
(
CK_BBOOL tokenPresent, /* only slots with tokens */
CK_SLOT_ID_PTR pSlotList, /* receives array of slot IDs */
CK_ULONG_PTR pulCount /* receives number of slots */
);
#endif
/* C_GetSlotInfo obtains information about a particular slot in
* the system.
*/
CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
#ifdef CK_NEED_ARG_LIST
(
CK_SLOT_ID slotID, /* the ID of the slot */
CK_SLOT_INFO_PTR pInfo /* receives the slot information */
);
#endif
/* C_GetTokenInfo obtains information about a particular token
* in the system.
*/
CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
#ifdef CK_NEED_ARG_LIST
(
CK_SLOT_ID slotID, /* ID of the token's slot */
CK_TOKEN_INFO_PTR pInfo /* receives the token information */
);
#endif
/* C_GetMechanismList obtains a list of mechanism types
* supported by a token.
*/
CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
#ifdef CK_NEED_ARG_LIST
(
CK_SLOT_ID slotID, /* ID of token's slot */
CK_MECHANISM_TYPE_PTR pMechanismList, /* gets mech. array */
CK_ULONG_PTR pulCount /* gets # of mechs. */
);
#endif
/* C_GetMechanismInfo obtains information about a particular
* mechanism possibly supported by a token.
*/
CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
#ifdef CK_NEED_ARG_LIST
(
CK_SLOT_ID slotID, /* ID of the token's slot */
CK_MECHANISM_TYPE type, /* type of mechanism */
CK_MECHANISM_INFO_PTR pInfo /* receives mechanism info */
);
#endif
/* C_InitToken initializes a token. */
CK_PKCS11_FUNCTION_INFO(C_InitToken)
#ifdef CK_NEED_ARG_LIST
(
CK_SLOT_ID slotID, /* ID of the token's slot */
CK_UTF8CHAR_PTR pPin, /* the SO's initial PIN */
CK_ULONG ulPinLen, /* length in bytes of the PIN */
CK_UTF8CHAR_PTR pLabel /* 32-byte token label (blank padded) */
);
#endif
/* C_InitPIN initializes the normal user's PIN. */
CK_PKCS11_FUNCTION_INFO(C_InitPIN)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_UTF8CHAR_PTR pPin, /* the normal user's PIN */
CK_ULONG ulPinLen /* length in bytes of the PIN */
);
#endif
/* C_SetPIN modifies the PIN of the user who is logged in. */
CK_PKCS11_FUNCTION_INFO(C_SetPIN)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_UTF8CHAR_PTR pOldPin, /* the old PIN */
CK_ULONG ulOldLen, /* length of the old PIN */
CK_UTF8CHAR_PTR pNewPin, /* the new PIN */
CK_ULONG ulNewLen /* length of the new PIN */
);
#endif
/* Session management */
/* C_OpenSession opens a session between an application and a
* token.
*/
CK_PKCS11_FUNCTION_INFO(C_OpenSession)
#ifdef CK_NEED_ARG_LIST
(
CK_SLOT_ID slotID, /* the slot's ID */
CK_FLAGS flags, /* from CK_SESSION_INFO */
CK_VOID_PTR pApplication, /* passed to callback */
CK_NOTIFY Notify, /* callback function */
CK_SESSION_HANDLE_PTR phSession /* gets session handle */
);
#endif
/* C_CloseSession closes a session between an application and a
* token.
*/
CK_PKCS11_FUNCTION_INFO(C_CloseSession)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession /* the session's handle */
);
#endif
/* C_CloseAllSessions closes all sessions with a token. */
CK_PKCS11_FUNCTION_INFO(C_CloseAllSessions)
#ifdef CK_NEED_ARG_LIST
(
CK_SLOT_ID slotID /* the token's slot */
);
#endif
/* C_GetSessionInfo obtains information about the session. */
CK_PKCS11_FUNCTION_INFO(C_GetSessionInfo)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_SESSION_INFO_PTR pInfo /* receives session info */
);
#endif
/* C_GetOperationState obtains the state of the cryptographic operation
* in a session.
*/
CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pOperationState, /* gets state */
CK_ULONG_PTR pulOperationStateLen /* gets state length */
);
#endif
/* C_SetOperationState restores the state of the cryptographic
* operation in a session.
*/
CK_PKCS11_FUNCTION_INFO(C_SetOperationState)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pOperationState, /* holds state */
CK_ULONG ulOperationStateLen, /* holds state length */
CK_OBJECT_HANDLE hEncryptionKey, /* en/decryption key */
CK_OBJECT_HANDLE hAuthenticationKey /* sign/verify key */
);
#endif
/* C_Login logs a user into a token. */
CK_PKCS11_FUNCTION_INFO(C_Login)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_USER_TYPE userType, /* the user type */
CK_UTF8CHAR_PTR pPin, /* the user's PIN */
CK_ULONG ulPinLen /* the length of the PIN */
);
#endif
/* C_Logout logs a user out from a token. */
CK_PKCS11_FUNCTION_INFO(C_Logout)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession /* the session's handle */
);
#endif
/* Object management */
/* C_CreateObject creates a new object. */
CK_PKCS11_FUNCTION_INFO(C_CreateObject)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_ATTRIBUTE_PTR pTemplate, /* the object's template */
CK_ULONG ulCount, /* attributes in template */
CK_OBJECT_HANDLE_PTR phObject /* gets new object's handle. */
);
#endif
/* C_CopyObject copies an object, creating a new object for the
* copy.
*/
CK_PKCS11_FUNCTION_INFO(C_CopyObject)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_OBJECT_HANDLE hObject, /* the object's handle */
CK_ATTRIBUTE_PTR pTemplate, /* template for new object */
CK_ULONG ulCount, /* attributes in template */
CK_OBJECT_HANDLE_PTR phNewObject /* receives handle of copy */
);
#endif
/* C_DestroyObject destroys an object. */
CK_PKCS11_FUNCTION_INFO(C_DestroyObject)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_OBJECT_HANDLE hObject /* the object's handle */
);
#endif
/* C_GetObjectSize gets the size of an object in bytes. */
CK_PKCS11_FUNCTION_INFO(C_GetObjectSize)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_OBJECT_HANDLE hObject, /* the object's handle */
CK_ULONG_PTR pulSize /* receives size of object */
);
#endif
/* C_GetAttributeValue obtains the value of one or more object
* attributes.
*/
CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_OBJECT_HANDLE hObject, /* the object's handle */
CK_ATTRIBUTE_PTR pTemplate, /* specifies attrs; gets vals */
CK_ULONG ulCount /* attributes in template */
);
#endif
/* C_SetAttributeValue modifies the value of one or more object
* attributes.
*/
CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_OBJECT_HANDLE hObject, /* the object's handle */
CK_ATTRIBUTE_PTR pTemplate, /* specifies attrs and values */
CK_ULONG ulCount /* attributes in template */
);
#endif
/* C_FindObjectsInit initializes a search for token and session
* objects that match a template.
*/
CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_ATTRIBUTE_PTR pTemplate, /* attribute values to match */
CK_ULONG ulCount /* attrs in search template */
);
#endif
/* C_FindObjects continues a search for token and session
* objects that match a template, obtaining additional object
* handles.
*/
CK_PKCS11_FUNCTION_INFO(C_FindObjects)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_OBJECT_HANDLE_PTR phObject, /* gets obj. handles */
CK_ULONG ulMaxObjectCount, /* max handles to get */
CK_ULONG_PTR pulObjectCount /* actual # returned */
);
#endif
/* C_FindObjectsFinal finishes a search for token and session
* objects.
*/
CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession /* the session's handle */
);
#endif
/* Encryption and decryption */
/* C_EncryptInit initializes an encryption operation. */
CK_PKCS11_FUNCTION_INFO(C_EncryptInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the encryption mechanism */
CK_OBJECT_HANDLE hKey /* handle of encryption key */
);
#endif
/* C_Encrypt encrypts single-part data. */
CK_PKCS11_FUNCTION_INFO(C_Encrypt)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pData, /* the plaintext data */
CK_ULONG ulDataLen, /* bytes of plaintext */
CK_BYTE_PTR pEncryptedData, /* gets ciphertext */
CK_ULONG_PTR pulEncryptedDataLen /* gets c-text size */
);
#endif
/* C_EncryptUpdate continues a multiple-part encryption
* operation.
*/
CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pPart, /* the plaintext data */
CK_ULONG ulPartLen, /* plaintext data len */
CK_BYTE_PTR pEncryptedPart, /* gets ciphertext */
CK_ULONG_PTR pulEncryptedPartLen /* gets c-text size */
);
#endif
/* C_EncryptFinal finishes a multiple-part encryption
* operation.
*/
CK_PKCS11_FUNCTION_INFO(C_EncryptFinal)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session handle */
CK_BYTE_PTR pLastEncryptedPart, /* last c-text */
CK_ULONG_PTR pulLastEncryptedPartLen /* gets last size */
);
#endif
/* C_DecryptInit initializes a decryption operation. */
CK_PKCS11_FUNCTION_INFO(C_DecryptInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the decryption mechanism */
CK_OBJECT_HANDLE hKey /* handle of decryption key */
);
#endif
/* C_Decrypt decrypts encrypted data in a single part. */
CK_PKCS11_FUNCTION_INFO(C_Decrypt)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pEncryptedData, /* ciphertext */
CK_ULONG ulEncryptedDataLen, /* ciphertext length */
CK_BYTE_PTR pData, /* gets plaintext */
CK_ULONG_PTR pulDataLen /* gets p-text size */
);
#endif
/* C_DecryptUpdate continues a multiple-part decryption
* operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pEncryptedPart, /* encrypted data */
CK_ULONG ulEncryptedPartLen, /* input length */
CK_BYTE_PTR pPart, /* gets plaintext */
CK_ULONG_PTR pulPartLen /* p-text size */
);
#endif
/* C_DecryptFinal finishes a multiple-part decryption
* operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptFinal)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pLastPart, /* gets plaintext */
CK_ULONG_PTR pulLastPartLen /* p-text size */
);
#endif
/* Message digesting */
/* C_DigestInit initializes a message-digesting operation. */
CK_PKCS11_FUNCTION_INFO(C_DigestInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism /* the digesting mechanism */
);
#endif
/* C_Digest digests data in a single part. */
CK_PKCS11_FUNCTION_INFO(C_Digest)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pData, /* data to be digested */
CK_ULONG ulDataLen, /* bytes of data to digest */
CK_BYTE_PTR pDigest, /* gets the message digest */
CK_ULONG_PTR pulDigestLen /* gets digest length */
);
#endif
/* C_DigestUpdate continues a multiple-part message-digesting
* operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pPart, /* data to be digested */
CK_ULONG ulPartLen /* bytes of data to be digested */
);
#endif
/* C_DigestKey continues a multi-part message-digesting
* operation, by digesting the value of a secret key as part of
* the data already digested.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestKey)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_OBJECT_HANDLE hKey /* secret key to digest */
);
#endif
/* C_DigestFinal finishes a multiple-part message-digesting
* operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pDigest, /* gets the message digest */
CK_ULONG_PTR pulDigestLen /* gets byte count of digest */
);
#endif
/* Signing and MACing */
/* C_SignInit initializes a signature (private key encryption)
* operation, where the signature is (will be) an appendix to
* the data, and plaintext cannot be recovered from the
* signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the signature mechanism */
CK_OBJECT_HANDLE hKey /* handle of signature key */
);
#endif
/* C_Sign signs (encrypts with private key) data in a single
* part, where the signature is (will be) an appendix to the
* data, and plaintext cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_Sign)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pData, /* the data to sign */
CK_ULONG ulDataLen, /* count of bytes to sign */
CK_BYTE_PTR pSignature, /* gets the signature */
CK_ULONG_PTR pulSignatureLen /* gets signature length */
);
#endif
/* C_SignUpdate continues a multiple-part signature operation,
* where the signature is (will be) an appendix to the data,
* and plaintext cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pPart, /* the data to sign */
CK_ULONG ulPartLen /* count of bytes to sign */
);
#endif
/* C_SignFinal finishes a multiple-part signature operation,
* returning the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignFinal)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pSignature, /* gets the signature */
CK_ULONG_PTR pulSignatureLen /* gets signature length */
);
#endif
/* C_SignRecoverInit initializes a signature operation, where
* the data can be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the signature mechanism */
CK_OBJECT_HANDLE hKey /* handle of the signature key */
);
#endif
/* C_SignRecover signs data in a single operation, where the
* data can be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_SignRecover)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pData, /* the data to sign */
CK_ULONG ulDataLen, /* count of bytes to sign */
CK_BYTE_PTR pSignature, /* gets the signature */
CK_ULONG_PTR pulSignatureLen /* gets signature length */
);
#endif
/* Verifying signatures and MACs */
/* C_VerifyInit initializes a verification operation, where the
* signature is an appendix to the data, and plaintext cannot
* cannot be recovered from the signature (e.g. DSA).
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the verification mechanism */
CK_OBJECT_HANDLE hKey /* verification key */
);
#endif
/* C_Verify verifies a signature in a single-part operation,
* where the signature is an appendix to the data, and plaintext
* cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_Verify)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pData, /* signed data */
CK_ULONG ulDataLen, /* length of signed data */
CK_BYTE_PTR pSignature, /* signature */
CK_ULONG ulSignatureLen /* signature length*/
);
#endif
/* C_VerifyUpdate continues a multiple-part verification
* operation, where the signature is an appendix to the data,
* and plaintext cannot be recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pPart, /* signed data */
CK_ULONG ulPartLen /* length of signed data */
);
#endif
/* C_VerifyFinal finishes a multiple-part verification
* operation, checking the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pSignature, /* signature to verify */
CK_ULONG ulSignatureLen /* signature length */
);
#endif
/* C_VerifyRecoverInit initializes a signature verification
* operation, where the data is recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the verification mechanism */
CK_OBJECT_HANDLE hKey /* verification key */
);
#endif
/* C_VerifyRecover verifies a signature in a single-part
* operation, where the data is recovered from the signature.
*/
CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pSignature, /* signature to verify */
CK_ULONG ulSignatureLen, /* signature length */
CK_BYTE_PTR pData, /* gets signed data */
CK_ULONG_PTR pulDataLen /* gets signed data len */
);
#endif
/* Dual-function cryptographic operations */
/* C_DigestEncryptUpdate continues a multiple-part digesting
* and encryption operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pPart, /* the plaintext data */
CK_ULONG ulPartLen, /* plaintext length */
CK_BYTE_PTR pEncryptedPart, /* gets ciphertext */
CK_ULONG_PTR pulEncryptedPartLen /* gets c-text length */
);
#endif
/* C_DecryptDigestUpdate continues a multiple-part decryption and
* digesting operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pEncryptedPart, /* ciphertext */
CK_ULONG ulEncryptedPartLen, /* ciphertext length */
CK_BYTE_PTR pPart, /* gets plaintext */
CK_ULONG_PTR pulPartLen /* gets plaintext len */
);
#endif
/* C_SignEncryptUpdate continues a multiple-part signing and
* encryption operation.
*/
CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pPart, /* the plaintext data */
CK_ULONG ulPartLen, /* plaintext length */
CK_BYTE_PTR pEncryptedPart, /* gets ciphertext */
CK_ULONG_PTR pulEncryptedPartLen /* gets c-text length */
);
#endif
/* C_DecryptVerifyUpdate continues a multiple-part decryption and
* verify operation.
*/
CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_BYTE_PTR pEncryptedPart, /* ciphertext */
CK_ULONG ulEncryptedPartLen, /* ciphertext length */
CK_BYTE_PTR pPart, /* gets plaintext */
CK_ULONG_PTR pulPartLen /* gets p-text length */
);
#endif
/* Key management */
/* C_GenerateKey generates a secret key, creating a new key
* object.
*/
CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* key generation mech. */
CK_ATTRIBUTE_PTR pTemplate, /* template for new key */
CK_ULONG ulCount, /* # of attrs in template */
CK_OBJECT_HANDLE_PTR phKey /* gets handle of new key */
);
#endif
/* C_GenerateKeyPair generates a public-key/private-key pair,
* creating new key objects.
*/
CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session handle */
CK_MECHANISM_PTR pMechanism, /* key-gen mech. */
CK_ATTRIBUTE_PTR pPublicKeyTemplate, /* template for pub. key */
CK_ULONG ulPublicKeyAttributeCount, /* # pub. attrs. */
CK_ATTRIBUTE_PTR pPrivateKeyTemplate, /* template for priv. key */
CK_ULONG ulPrivateKeyAttributeCount, /* # priv. attrs. */
CK_OBJECT_HANDLE_PTR phPublicKey, /* gets pub. key handle */
CK_OBJECT_HANDLE_PTR phPrivateKey /* gets priv. key handle */
);
#endif
/* C_WrapKey wraps (i.e., encrypts) a key. */
CK_PKCS11_FUNCTION_INFO(C_WrapKey)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_MECHANISM_PTR pMechanism, /* the wrapping mechanism */
CK_OBJECT_HANDLE hWrappingKey, /* wrapping key */
CK_OBJECT_HANDLE hKey, /* key to be wrapped */
CK_BYTE_PTR pWrappedKey, /* gets wrapped key */
CK_ULONG_PTR pulWrappedKeyLen /* gets wrapped key size */
);
#endif
/* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
* key object.
*/
CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_MECHANISM_PTR pMechanism, /* unwrapping mech. */
CK_OBJECT_HANDLE hUnwrappingKey, /* unwrapping key */
CK_BYTE_PTR pWrappedKey, /* the wrapped key */
CK_ULONG ulWrappedKeyLen, /* wrapped key len */
CK_ATTRIBUTE_PTR pTemplate, /* new key template */
CK_ULONG ulAttributeCount, /* template length */
CK_OBJECT_HANDLE_PTR phKey /* gets new handle */
);
#endif
/* C_DeriveKey derives a key from a base key, creating a new key
* object.
*/
CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* session's handle */
CK_MECHANISM_PTR pMechanism, /* key deriv. mech. */
CK_OBJECT_HANDLE hBaseKey, /* base key */
CK_ATTRIBUTE_PTR pTemplate, /* new key template */
CK_ULONG ulAttributeCount, /* template length */
CK_OBJECT_HANDLE_PTR phKey /* gets new handle */
);
#endif
/* Random number generation */
/* C_SeedRandom mixes additional seed material into the token's
* random number generator.
*/
CK_PKCS11_FUNCTION_INFO(C_SeedRandom)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR pSeed, /* the seed material */
CK_ULONG ulSeedLen /* length of seed material */
);
#endif
/* C_GenerateRandom generates random data. */
CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession, /* the session's handle */
CK_BYTE_PTR RandomData, /* receives the random data */
CK_ULONG ulRandomLen /* # of bytes to generate */
);
#endif
/* Parallel function management */
/* C_GetFunctionStatus is a legacy function; it obtains an
* updated status of a function running in parallel with an
* application.
*/
CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession /* the session's handle */
);
#endif
/* C_CancelFunction is a legacy function; it cancels a function
* running in parallel.
*/
CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
#ifdef CK_NEED_ARG_LIST
(
CK_SESSION_HANDLE hSession /* the session's handle */
);
#endif
/* C_WaitForSlotEvent waits for a slot event (token insertion,
* removal, etc.) to occur.
*/
CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
#ifdef CK_NEED_ARG_LIST
(
CK_FLAGS flags, /* blocking/nonblocking flag */
CK_SLOT_ID_PTR pSlot, /* location that receives the slot ID */
CK_VOID_PTR pRserved /* reserved. Should be NULL_PTR */
);
#endif

2006
lib/isc/include/pkcs11/pkcs11t.h
View File

File diff suppressed because it is too large Load Diff

140
lib/isc/unix/pk11_api.c
View File

@@ -38,7 +38,7 @@ pkcs_C_Initialize(CK_VOID_PTR pReserved) {
CK_C_Initialize sym;
if (hPK11 != NULL)
return (CKR_LIBRARY_ALREADY_INITIALIZED);
return (CKR_CRYPTOKI_ALREADY_INITIALIZED);
hPK11 = dlopen(pk11_get_lib_name(), RTLD_NOW);
@@ -46,11 +46,11 @@ pkcs_C_Initialize(CK_VOID_PTR pReserved) {
snprintf(loaderrmsg, sizeof(loaderrmsg),
"dlopen(\"%s\") failed: %s\n",
pk11_get_lib_name(), dlerror());
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
}
sym = (CK_C_Initialize)dlsym(hPK11, "C_Initialize");
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(pReserved);
}
@@ -64,13 +64,13 @@ pkcs_C_Finalize(CK_VOID_PTR pReserved) {
CK_RV rv;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
sym = (CK_C_Finalize)dlsym(hPK11, "C_Finalize");
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
rv = (*sym)(pReserved);
if ((rv == CKR_OK) && (dlclose(hPK11) != 0))
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
hPK11 = NULL;
return (rv);
}
@@ -83,13 +83,13 @@ pkcs_C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_GetSlotList)dlsym(hPK11, "C_GetSlotList");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(tokenPresent, pSlotList, pulCount);
}
@@ -99,13 +99,13 @@ pkcs_C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) {
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_GetTokenInfo)dlsym(hPK11, "C_GetTokenInfo");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(slotID, pInfo);
}
@@ -117,14 +117,14 @@ pkcs_C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_GetMechanismInfo)dlsym(hPK11,
"C_GetMechanismInfo");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(slotID, type, pInfo);
}
@@ -145,14 +145,14 @@ pkcs_C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags,
snprintf(loaderrmsg, sizeof(loaderrmsg),
"dlopen(\"%s\") failed: %s\n",
pk11_get_lib_name(), dlerror());
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
}
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_OpenSession)dlsym(hPK11, "C_OpenSession");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(slotID, flags, pApplication, Notify, phSession);
}
@@ -162,13 +162,13 @@ pkcs_C_CloseSession(CK_SESSION_HANDLE hSession) {
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_CloseSession)dlsym(hPK11, "C_CloseSession");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession);
}
@@ -180,13 +180,13 @@ pkcs_C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_Login)dlsym(hPK11, "C_Login");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, userType, pPin, usPinLen);
}
@@ -196,13 +196,13 @@ pkcs_C_Logout(CK_SESSION_HANDLE hSession) {
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_Logout)dlsym(hPK11, "C_Logout");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession);
}
@@ -214,13 +214,13 @@ pkcs_C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_CreateObject)dlsym(hPK11, "C_CreateObject");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pTemplate, usCount, phObject);
}
@@ -230,13 +230,13 @@ pkcs_C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) {
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_DestroyObject)dlsym(hPK11, "C_DestroyObject");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, hObject);
}
@@ -248,14 +248,14 @@ pkcs_C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_GetAttributeValue)dlsym(hPK11,
"C_GetAttributeValue");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, hObject, pTemplate, usCount);
}
@@ -267,14 +267,14 @@ pkcs_C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_SetAttributeValue)dlsym(hPK11,
"C_SetAttributeValue");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, hObject, pTemplate, usCount);
}
@@ -286,13 +286,13 @@ pkcs_C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_FindObjectsInit)dlsym(hPK11, "C_FindObjectsInit");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pTemplate, usCount);
}
@@ -304,13 +304,13 @@ pkcs_C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_FindObjects)dlsym(hPK11, "C_FindObjects");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, phObject, usMaxObjectCount, pusObjectCount);
}
@@ -321,14 +321,14 @@ pkcs_C_FindObjectsFinal(CK_SESSION_HANDLE hSession)
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_FindObjectsFinal)dlsym(hPK11,
"C_FindObjectsFinal");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession);
}
@@ -340,13 +340,13 @@ pkcs_C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_EncryptInit)dlsym(hPK11, "C_EncryptInit");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pMechanism, hKey);
}
@@ -359,13 +359,13 @@ pkcs_C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_Encrypt)dlsym(hPK11, "C_Encrypt");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pData, ulDataLen,
pEncryptedData, pulEncryptedDataLen);
}
@@ -376,13 +376,13 @@ pkcs_C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) {
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_DigestInit)dlsym(hPK11, "C_DigestInit");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pMechanism);
}
@@ -394,13 +394,13 @@ pkcs_C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_DigestUpdate)dlsym(hPK11, "C_DigestUpdate");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pPart, ulPartLen);
}
@@ -412,13 +412,13 @@ pkcs_C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_DigestFinal)dlsym(hPK11, "C_DigestFinal");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pDigest, pulDigestLen);
}
@@ -430,13 +430,13 @@ pkcs_C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_SignInit)dlsym(hPK11, "C_SignInit");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pMechanism, hKey);
}
@@ -449,13 +449,13 @@ pkcs_C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_Sign)dlsym(hPK11, "C_Sign");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pData, ulDataLen, pSignature, pulSignatureLen);
}
@@ -467,13 +467,13 @@ pkcs_C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_SignUpdate)dlsym(hPK11, "C_SignUpdate");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pPart, ulPartLen);
}
@@ -485,13 +485,13 @@ pkcs_C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_SignFinal)dlsym(hPK11, "C_SignFinal");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pSignature, pulSignatureLen);
}
@@ -503,13 +503,13 @@ pkcs_C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_VerifyInit)dlsym(hPK11, "C_VerifyInit");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pMechanism, hKey);
}
@@ -522,13 +522,13 @@ pkcs_C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_Verify)dlsym(hPK11, "C_Verify");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pData, ulDataLen, pSignature, ulSignatureLen);
}
@@ -540,13 +540,13 @@ pkcs_C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_VerifyUpdate)dlsym(hPK11, "C_VerifyUpdate");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pPart, ulPartLen);
}
@@ -558,13 +558,13 @@ pkcs_C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_VerifyFinal)dlsym(hPK11, "C_VerifyFinal");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pSignature, ulSignatureLen);
}
@@ -577,13 +577,13 @@ pkcs_C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_GenerateKey)dlsym(hPK11, "C_GenerateKey");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pMechanism, pTemplate, ulCount, phKey);
}
@@ -601,13 +601,13 @@ pkcs_C_GenerateKeyPair(CK_SESSION_HANDLE hSession,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_GenerateKeyPair)dlsym(hPK11, "C_GenerateKeyPair");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession,
pMechanism,
pPublicKeyTemplate,
@@ -627,13 +627,13 @@ pkcs_C_DeriveKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_DeriveKey)dlsym(hPK11, "C_DeriveKey");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession,
pMechanism,
hBaseKey,
@@ -650,13 +650,13 @@ pkcs_C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_SeedRandom)dlsym(hPK11, "C_SeedRandom");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, pSeed, ulSeedLen);
}
@@ -668,12 +668,12 @@ pkcs_C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR RandomData,
static void *pPK11 = NULL;
if (hPK11 == NULL)
return (CKR_LIBRARY_FAILED_TO_LOAD);
return (CKR_LIBRARY_LOAD_FAILED);
if ((sym == NULL) || (hPK11 != pPK11)) {
pPK11 = hPK11;
sym = (CK_C_GenerateRandom)dlsym(hPK11, "C_GenerateRandom");
}
if (sym == NULL)
return (CKR_SYMBOL_RESOLUTION_FAILED);
return (CKR_FUNCTION_NOT_SUPPORTED);
return (*sym)(hSession, RandomData, ulRandomLen);
}

6
lib/isc/win32/libisc.vcxproj.filters.in
View File

@@ -279,12 +279,6 @@
<ClInclude Include="..\include\pkcs11\pkcs11.h">
<Filter>Pkcs11 Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\pkcs11\pkcs11f.h">
<Filter>Pkcs11 Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\pkcs11\pkcs11t.h">
<Filter>Pkcs11 Header Files</Filter>
</ClInclude>
@END PKCS11
<ClInclude Include="include\isc\bind_registry.h">
<Filter>Win32 Header Files</Filter>

2
lib/isc/win32/libisc.vcxproj.in
View File

@@ -368,8 +368,6 @@ copy InstallFiles ..\Build\Release\
<ClInclude Include="..\include\pk11\pk11.h" />
<ClInclude Include="..\include\pk11\result.h" />
<ClInclude Include="..\include\pkcs11\pkcs11.h" />
<ClInclude Include="..\include\pkcs11\pkcs11f.h" />
<ClInclude Include="..\include\pkcs11\pkcs11t.h" />
@END PKCS11
<ClInclude Include="errno2result.h" />
<ClInclude Include="include\isc\bindevt.h" />

4
util/copyrights
View File

@@ -2224,9 +2224,7 @@
./lib/isc/include/pk11/result.h C 2014,2016,2018,2019
./lib/isc/include/pk11/site.h C 2016,2017,2018,2019
./lib/isc/include/pkcs11/eddsa.h C 2017,2018,2019
./lib/isc/include/pkcs11/pkcs11.h X 2014,2016,2018,2019
./lib/isc/include/pkcs11/pkcs11f.h X 2014,2016,2018,2019
./lib/isc/include/pkcs11/pkcs11t.h X 2014,2016,2018,2019
./lib/isc/include/pkcs11/pkcs11.h X 2019
./lib/isc/iterated_hash.c C 2006,2008,2009,2016,2018,2019
./lib/isc/lex.c C 1998,1999,2000,2001,2002,2003,2004,2005,2007,2013,2014,2015,2016,2017,2018,2019
./lib/isc/lfsr.c C 1999,2000,2001,2002,2004,2005,2007,2016,2018,2019