Skip to content

Systematic restructuring of internal state #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MatthiasValvekens merged 2 commits into from
Jun 28, 2025
Merged

Systematic restructuring of internal state #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c5cced
Restructure to allow multiple loading
MatthiasValvekens Jun 21, 2025
09e363d
Implement operation management generically
MatthiasValvekens Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions extern/pkcs11t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ typedef CK_ULONG CK_USER_TYPE;
#define CKU_USER 1UL
/* Context specific */
#define CKU_CONTEXT_SPECIFIC 2UL
/* Value used in python-pkcs11 as a sentinel value for non-logged in sessions */
#define CKU_USER_NOBODY 999UL

/* CK_STATE enumerates the session states */
typedef CK_ULONG CK_STATE;
Expand Down
22 changes: 10 additions & 12 deletions pkcs11/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,27 @@
from .types import * # noqa: F403
from .util import dh, dsa, ec, rsa, x509 # noqa: F401

_so = None
_lib = None
_loaded = {}


def lib(so):
"""
Wrap the main library call coming from Cython with a preemptive
dynamic loading.
"""
global _lib
global _so
global _loaded

if _lib:
if _so != so:
raise AlreadyInitialized( # noqa: F405
"Already initialized with %s" % _so
)
else:
return _lib
try:
_lib = _loaded[so]
if not _lib.initialized:
_lib.initialize()
return _lib
except KeyError:
pass

from . import _pkcs11

_lib = _pkcs11.lib(so)
_so = so
_loaded[so] = _lib

return _lib
25 changes: 25 additions & 0 deletions pkcs11/_pkcs11.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,16 @@ cdef extern from '../extern/cryptoki.h':

CKR_FUNCTION_REJECTED,

CKR_OPERATION_CANCEL_FAILED,

CKR_VENDOR_DEFINED,


ctypedef enum CK_USER_TYPE:
CKU_SO,
CKU_USER,
CKU_CONTEXT_SPECIFIC,
CKU_USER_NOBODY,

cdef enum:
CK_TRUE,
Expand Down Expand Up @@ -589,6 +592,28 @@ cdef extern from '../extern/cryptoki.h':
# All other APIs are taken from the CK_FUNCTION_LIST table
ctypedef CK_RV (*C_GetFunctionList_ptr) (CK_FUNCTION_LIST **) nogil

ctypedef CK_RV (*KeyOperationInit) (
Copy link
Collaborator Author

@MatthiasValvekens MatthiasValvekens Jun 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some function pointer typedefs for cryptographic operations. Used in the context manager that deals with sizing buffers for the module, since the logic cares fairly little about what the underlying operations are for, so these typedefs allow for some poor mans' generics...

CK_SESSION_HANDLE session,
CK_MECHANISM *mechanism,
CK_OBJECT_HANDLE key
) nogil
ctypedef CK_RV (*OperationUpdateWithResult) (
CK_SESSION_HANDLE session,
CK_BYTE *part_in,
CK_ULONG part_in_len,
CK_BYTE *part_out,
CK_ULONG *part_out_len
) nogil
ctypedef CK_RV (*OperationUpdate) (
CK_SESSION_HANDLE session,
CK_BYTE *part_in,
CK_ULONG part_in_len
) nogil
ctypedef CK_RV (*OperationWithResult) (
CK_SESSION_HANDLE session,
CK_BYTE *part_out,
CK_ULONG *part_out_len
) nogil

cdef inline CK_BYTE_buffer(length):
"""Make a buffer for `length` CK_BYTEs."""
Expand Down
Loading
Loading