Merge pull request #18 from segevfiner/refresh

Refresh

Author: segevfiner

.github/workflows/build-and-test.yml

@@ -15,33 +15,32 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
         include:
         - os: windows-latest
-          python-version: '3.13'
+          python-version: '3.14'
         - os: macos-latest
-          python-version: '3.13'
+          python-version: '3.14'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v7
       with:
         python-version: ${{ matrix.python-version }}
     - name: Set CPPFLAGS/LDFLAGS for OpenSSL on macOS
       if: matrix.os == 'macos-latest'
       run: |
         brew install openssl@3.0
         echo "CPPFLAGS=-I/opt/homebrew/opt/openssl@3.0/include" >> $GITHUB_ENV
-        echo "LDFLAGS=-L/Library/Frameworks/Python.framework/Versions/3.13/lib" >> $GITHUB_ENV
+        echo "LDFLAGS=-L/Library/Frameworks/Python.framework/Versions/3.14/lib" >> $GITHUB_ENV
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel
     - name: Install
       run: |
         pip install -e .[dev]
     - name: Lint with flake8
-      if: ${{ matrix.python-version != '3.7' }}
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics

.github/workflows/publish.yml

@@ -13,19 +13,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v7
         with:
-          python-version: "3.13"
+          python-version: "3.14"
 
       - name: Build release distributions
         run: |
           python -m pip install build
           python -m build --sdist
 
       - name: Upload distributions
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: release-dists
           path: dist/
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Retrieve release distributions
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: release-dists
           path: dist/
@@ -55,4 +55,4 @@ jobs:
           packages-dir: dist/
 
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3

.readthedocs.yml

@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.14"
 
 sphinx:
   configuration: docs/conf.py

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+Unreleased
+----------
+Changed
+^^^^^^^
+* CI/CD and dependencies refresh.
+* More accurate condition for OpenSSL 3.1+ support.
+
 v0.5.2 (2025-06-6)
 ------------------
 Changed

_sslkeylog.c

@@ -327,8 +327,12 @@ PyMODINIT_FUNC init_sslkeylog(void)
 {
     PyObject *m = NULL;
     PyObject *_ssl;
+    unsigned long runtime_version = OpenSSL_version_num();
 
-    if ((OpenSSL_version_num() & 0xFFFFF000) != (OPENSSL_VERSION_NUMBER & 0xFFFFF000)) {
+    /* OpenSSL >=3 only breaks ABI on major version bumps, older ones on major.minor.patch */
+    if ((runtime_version & 0xFFFFF000) >= 0x03000000
+        ? (runtime_version & 0xFF000000) != (OPENSSL_VERSION_NUMBER & 0xFF000000)
+        : (runtime_version & 0xFFFFF000) != (OPENSSL_VERSION_NUMBER & 0xFFFFF000)) {
         PyErr_SetString(PyExc_RuntimeError,
             "OpenSSL version mismatch between build and runtime. "
             "Please clear your pip cache and rebuild sslkeylog");

setup.py

@@ -15,7 +15,7 @@
 
 if sys.platform == "win32":
     openssl_base_version = re.search(r"^OpenSSL ([0-9.]+)", ssl.OPENSSL_VERSION).group(1)
-    if openssl_base_version.startswith("3.0"):
+    if openssl_base_version.startswith("3."):
         openssl_version = "3.0.11"
     elif openssl_base_version == "1.1.1":
         openssl_version = "1.1.1c"
@@ -66,15 +66,12 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13"
+        "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14"
     ],
     keywords="ssl tls sslkeylogfile",
     zip_safe=False,
@@ -93,7 +90,7 @@
             "pytest-metadata",
             "mock",
             "six",
-            "sphinx==5.*;python_version>='3.0'"
+            "sphinx==9.*;python_version>='3.12'"
         ],
     },
 )

sslkeylog.py

@@ -25,7 +25,7 @@
 import _sslkeylog
 
 
-__version__ = u"0.5.2"
+__version__ = u"0.5.3"
 
 
 if sys.version_info[0] >= 3: