Update dependencies and fix Windows compatibility on Python 3.12

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+
+    # Maintain dependencies for PIP
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"

dev-requirements.txt

@@ -4,44 +4,84 @@
 #
 #    pip-compile dev-requirements.in
 #
-alabaster==0.7.12         # via sphinx
-asn1crypto==1.3.0         # via oscrypto
-babel==2.8.0              # via sphinx
-certifi==2019.11.28       # via requests
-cffi==1.14.0              # via cryptography
-chardet==3.0.4            # via requests
-cryptography==3.2         # via -r dev-requirements.in
-cython==0.29.15           # via -r dev-requirements.in
-docutils==0.16            # via sphinx
-entrypoints==0.3          # via flake8
-flake8==3.7.9             # via -r dev-requirements.in
-idna==2.9                 # via requests
-imagesize==1.2.0          # via sphinx
-jinja2==2.11.1            # via sphinx
-markupsafe==1.1.1         # via jinja2
-mccabe==0.6.1             # via flake8
-oscrypto==1.2.0           # via -r dev-requirements.in
-packaging==20.1           # via sphinx
-parameterized==0.7.4      # via -r dev-requirements.in
-pycodestyle==2.5.0        # via flake8
-pycparser==2.19           # via cffi
-pyflakes==2.1.1           # via flake8
-pygments==2.5.2           # via sphinx
-pyparsing==2.4.6          # via packaging
-pytz==2019.3              # via babel
-requests==2.23.0          # via sphinx
-setuptools-scm==3.5.0     # via -r dev-requirements.in
-six==1.14.0               # via cryptography, packaging
-snowballstemmer==2.0.0    # via sphinx
-sphinx-rtd-theme==0.4.3   # via -r dev-requirements.in
-sphinx==2.4.3             # via -r dev-requirements.in, sphinx-rtd-theme
-sphinxcontrib-applehelp==1.0.1  # via sphinx
-sphinxcontrib-devhelp==1.0.1  # via sphinx
-sphinxcontrib-htmlhelp==1.0.3  # via sphinx
-sphinxcontrib-jsmath==1.0.1  # via sphinx
-sphinxcontrib-qthelp==1.0.2  # via sphinx
-sphinxcontrib-serializinghtml==1.1.3  # via sphinx
-urllib3==1.25.8           # via requests
+alabaster==0.7.12
+    # via sphinx
+asn1crypto==1.5.0
+    # via oscrypto
+babel==2.9.1
+    # via sphinx
+certifi==2024.7.4
+    # via requests
+cffi==1.14.0
+    # via cryptography
+charset-normalizer==3.3.2
+    # via requests
+cryptography==43.0.1
+    # via -r dev-requirements.in
+cython==3.0.9
+    # via -r dev-requirements.in
+docutils==0.16
+    # via sphinx
+entrypoints==0.3
+    # via flake8
+flake8==3.7.9
+    # via -r dev-requirements.in
+idna==3.7
+    # via requests
+imagesize==1.2.0
+    # via sphinx
+jinja2==3.1.4
+    # via sphinx
+markupsafe==2.1.5
+    # via jinja2
+mccabe==0.6.1
+    # via flake8
+oscrypto==1.2.0
+    # via -r dev-requirements.in
+packaging==20.1
+    # via sphinx
+parameterized==0.7.4
+    # via -r dev-requirements.in
+pycodestyle==2.5.0
+    # via flake8
+pycparser==2.19
+    # via cffi
+pyflakes==2.1.1
+    # via flake8
+pygments==2.5.2
+    # via sphinx
+pyparsing==2.4.6
+    # via packaging
+pytz==2019.3
+    # via babel
+requests==2.32.2
+    # via sphinx
+setuptools-scm==3.5.0
+    # via -r dev-requirements.in
+six==1.14.0
+    # via packaging
+snowballstemmer==2.0.0
+    # via sphinx
+sphinx==2.4.3
+    # via
+    #   -r dev-requirements.in
+    #   sphinx-rtd-theme
+sphinx-rtd-theme==0.4.3
+    # via -r dev-requirements.in
+sphinxcontrib-applehelp==1.0.1
+    # via sphinx
+sphinxcontrib-devhelp==1.0.1
+    # via sphinx
+sphinxcontrib-htmlhelp==1.0.3
+    # via sphinx
+sphinxcontrib-jsmath==1.0.1
+    # via sphinx
+sphinxcontrib-qthelp==1.0.2
+    # via sphinx
+sphinxcontrib-serializinghtml==1.1.3
+    # via sphinx
+urllib3==1.26.19
+    # via requests
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

extern/pkcs11.h

@@ -1,12 +1,11 @@
-/* Copyright (c) OASIS Open 2016. All Rights Reserved./
- * /Distributed under the terms of the OASIS IPR Policy,
- * [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY
- * IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
- */
-
-/* Latest version of the specification:
- * http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
+/*
+ * PKCS #11 Specification Version 3.1
+ * OASIS Standard
+ * 23 July 2023
+ * Copyright (c) OASIS Open 2023. All Rights Reserved.
+ * Source: https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/os/include/pkcs11-v3.1/
+ * Latest stage of narrative specification: https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/pkcs11-spec-v3.1.html
+ * TC IPR Statement: https://www.oasis-open.org/committees/pkcs11/ipr.php 
  */
 
 #ifndef _PKCS11_H_
@@ -29,8 +28,7 @@ extern "C" {
  * convention on packing is that structures should be 1-byte
  * aligned.
  *
- * If you're using Microsoft Developer Studio 5.0 to produce
- * Win32 stuff, this might be done by using the following
+ * If you're using Windows this might be done by using the following
  * preprocessor directive before including pkcs11.h or pkcs11t.h:
  *
  * #pragma pack(push, cryptoki, 1)
@@ -40,13 +38,6 @@ extern "C" {
  *
  * #pragma pack(pop, cryptoki)
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to produce Win16 stuff, this might be done by using
- * the following preprocessor directive before including
- * pkcs11.h or pkcs11t.h:
- *
- * #pragma pack(1)
- *
  * In a UNIX environment, you're on your own for this.  You might
  * not need to do (or be able to do!) anything.
  *
@@ -59,16 +50,10 @@ extern "C" {
  *
  * typedef CK_BYTE CK_PTR CK_BYTE_PTR;
  *
- * If you're using Microsoft Developer Studio 5.0 to produce
- * Win32 stuff, it might be defined by:
+ * If you're using Windows, it might be defined by:
  *
  * #define CK_PTR *
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to produce Win16 stuff, it might be defined by:
- *
- * #define CK_PTR far *
- *
  * In a typical UNIX environment, it might be defined by:
  *
  * #define CK_PTR *
@@ -83,19 +68,12 @@ extern "C" {
  *   CK_VOID_PTR pReserved
  * );
  *
- * If you're using Microsoft Developer Studio 5.0 to declare a
- * function in a Win32 Cryptoki .dll, it might be defined by:
+ * If you're using Windows to declare a function in a Win32 Cryptoki .dll, 
+ * it might be defined by:
  *
  * #define CK_DECLARE_FUNCTION(returnType, name) \
  *   returnType __declspec(dllimport) name
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to declare a function in a Win16 Cryptoki .dll, it
- * might be defined by:
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType __export _far _pascal name
- *
  * In a UNIX environment, it might be defined by:
  *
  * #define CK_DECLARE_FUNCTION(returnType, name) \
@@ -120,19 +98,12 @@ extern "C" {
  * typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtrType)(args);
  * funcPtrType funcPtr;
  *
- * If you're using Microsoft Developer Studio 5.0 to access
+ * If you're using Windows to access
  * functions in a Win32 Cryptoki .dll, in might be defined by:
  *
  * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
  *   returnType __declspec(dllimport) (* name)
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to access functions in a Win16 Cryptoki .dll, it might
- * be defined by:
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType __export _far _pascal (* name)
- *
  * In a UNIX environment, it might be defined by:
  *
  * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
@@ -153,18 +124,11 @@ extern "C" {
  * typedef CK_CALLBACK_FUNCTION(CK_RV, myCallbackType)(args);
  * myCallbackType myCallback;
  *
- * If you're using Microsoft Developer Studio 5.0 to do Win32
- * Cryptoki development, it might be defined by:
+ * If you're using Windows, it might be defined by:
  *
  * #define CK_CALLBACK_FUNCTION(returnType, name) \
  *   returnType (* name)
  *
- * If you're using an earlier version of Microsoft Developer
- * Studio to do Win16 development, it might be defined by:
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType _far _pascal (* name)
- *
  * In a UNIX environment, it might be defined by:
  *
  * #define CK_CALLBACK_FUNCTION(returnType, name) \
@@ -240,6 +204,22 @@ extern "C" {
 #define CK_PKCS11_FUNCTION_INFO(name) \
   __PASTE(CK_,name) name;
 
+/* Create the 3.0 Function list */
+struct CK_FUNCTION_LIST_3_0 {
+
+  CK_VERSION    version;  /* Cryptoki version */
+
+/* Pile all the function pointers into the CK_FUNCTION_LIST. */
+/* pkcs11f.h has all the information about the Cryptoki
+ * function prototypes.
+ */
+#include "pkcs11f.h"
+
+};
+
+#define CK_PKCS11_2_0_ONLY 1
+
+/* Continue to define the old CK_FUNCTION_LIST */
 struct CK_FUNCTION_LIST {
 
   CK_VERSION    version;  /* Cryptoki version */
@@ -253,6 +233,7 @@ struct CK_FUNCTION_LIST {
 };
 
 #undef CK_PKCS11_FUNCTION_INFO
+#undef CK_PKCS11_2_0_ONLY
 
 
 #undef __PASTE
@@ -262,4 +243,3 @@ struct CK_FUNCTION_LIST {
 #endif
 
 #endif /* _PKCS11_H_ */
-