Merge branch 'Legrandin:master' into resolve_redundantAssignment

Author: vil02

.github/workflows/integration.yml

@@ -7,17 +7,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12", "3.13-dev" ]
+        python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11", "3.12", "3.13" ]
         cffi: [ yes, no ]
-        os: [ ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
         include:
-          - python-version: "3.12"
+          - python-version: "3.13"
             cffi: yes
-            os: macos-12
-          - python-version: "3.12"
+            os: macos-13
+          - python-version: "3.13"
             cffi: no
             os: windows-latest
-          - python-version: "3.12"
+          - python-version: "3.13"
             cffi: yes
             os: windows-latest
           - python-version: pypy2.7
@@ -26,14 +26,17 @@ jobs:
           - python-version: pypy3.9
             cffi: no
             os: ubuntu-latest
+          - python-version: "3.13"
+            cffi: yes
+            os: ubuntu-22.04-arm
     env:
       CFLAGS: "-Wconversion"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -66,18 +69,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, windows-latest]
+        os: [ ubuntu-22.04, windows-latest]
         cffi: [ yes, no ]
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             container: python:2.7.18-buster
     container:
       image: ${{ matrix.container }}
     env:
       CFLAGS: "-Wconversion"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install Python 2
       if: matrix.os == 'windows-latest'
@@ -123,9 +126,9 @@ jobs:
   mypy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.x"
     - name: Install dependencies
@@ -142,7 +145,7 @@ jobs:
         sse: [0, 1]
         arch: [x64, x32]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -164,11 +167,11 @@ jobs:
           - x64
           - win32
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python "3.12"
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python "3.13"
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.12"
+        python-version: "3.13"
     - name: Install MSVC
       uses: ilammy/msvc-dev-cmd@v1
       with:
@@ -186,11 +189,11 @@ jobs:
     env:
       CFLAGS: "-Wconversion"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: No-GIL Python
       uses: deadsnakes/action@v3.1.0
       with:
-        python-version: "3.13-dev"
+        python-version: "3.13"
         nogil: true
 
     - name: Install dependencies (testing only)

.github/workflows/wheels.yml

@@ -10,9 +10,9 @@ jobs:
     name: Build source package
     runs-on: [ ubuntu-latest ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: '3.x'
@@ -22,39 +22,41 @@ jobs:
           python -m pip install setuptools
           python setup.py sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: source
+          name: source-${{ github.ref_name }}
           path: ./dist/*.tar.gz
 
   build_python3_wheels:
     name: Build Python 3 wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
+        os: [ubuntu-22.04, windows-2019, macos-13, ubuntu-22.04-arm]
 
     if: github.actor == 'Legrandin'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Select architecture for MacOS
         run: |
           echo 'CIBW_ARCHS=x86_64 universal2' >> $GITHUB_ENV
         if: runner.os == 'macOS'
 
-      - uses: pypa/cibuildwheel@v2.21.1
+      - uses: pypa/cibuildwheel@v2.22.0
         name: Build wheels
         env:
           # cibuildwheel will build wheel once and test it for each CPython version
           # and for PyPy > 3.8.
-          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* cp313-* pp39-* pp310-*"
+          CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-* cp312-* cp313-* pp39-* pp310-*"
           CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"
           CIBW_MANYLINUX_I686_IMAGE: "manylinux2014"
+          CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux2014"
           CIBW_MANYLINUX_PYPY_X86_64_IMAGE: "manylinux2014"
           CIBW_MANYLINUX_PYPY_I686_IMAGE: "manylinux2014"
-          CIBW_FREE_THREADED_SUPPORT: "true"
+          CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: "manylinux2014"
+          CIBW_ENABLE: "cpython-freethreading pypy"
           CIBW_BEFORE_TEST_LINUX: "(ldd /bin/ls | grep -q musl && apk add gmp) || true"
 
           # Set pycryptodome/x test command according to built package
@@ -66,20 +68,20 @@ jobs:
       - name: Delete manylinux1 wheels
         if: runner.os == 'Linux'
         run: |
-          rm -f wheelhouse/*-manylinux1_i686.whl
-          rm -f wheelhouse/*-manylinux1_x86_64.whl
+          rm -f wheelhouse/*-manylinux1_*.whl
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-python3-${{ matrix.os }}-${{ github.ref_name }}
+          overwrite: true
           path: ./wheelhouse/*.whl
 
   build_legacy_wheels:
     name: Build legacy Python wheels on ${{ matrix.os }} (${{ matrix.arch }})
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, windows-2019, macos-12 ]
+        os: [ ubuntu-22.04, windows-2019, macos-13 ]
         arch: [ multi-arch ]
         # Python 2 on Windows requires manual toolchain setup (per-arch) due to newer MSVC used here
         exclude:
@@ -94,7 +96,7 @@ jobs:
     if: github.actor == 'Legrandin'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install MSVC
         if: runner.os == 'Windows'
@@ -136,10 +138,10 @@ jobs:
       - name: Delete manylinux1 wheels
         if: runner.os == 'Linux'
         run: |
-          rm -f wheelhouse/*-manylinux1_i686.whl
-          rm -f wheelhouse/*-manylinux1_x86_64.whl
+          rm -f wheelhouse/*-manylinux1_*.whl
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-legacy-${{ matrix.os }}-${{ github.ref_name }}
+          overwrite: true
           path: ./wheelhouse/*.whl

.readthedocs.yaml

@@ -1,7 +1,7 @@
 version: 2
 python:
   install:
-    - requirements: Doc/requirements.txt
+    - requirements: Doc/requirements-docs.txt
 build:
   os: ubuntu-22.04
   tools:

Changelog.rst

@@ -1,6 +1,36 @@
 Changelog
 =========
 
+Under development
+++++++++++++++++++++++++++
+
+New features
+---------------
+* Added cipher modes Key Wrap (KW, RFC3394) and Key Wrap with Padding (KWP, RFC5649).
+  Both are defined also in NIST SP 800-38F.
+
+Resolved issues
+---------------
+* GH#862: For HashEdDSA and Ed448, sign() and verify() modified the state of the XOF.
+
+3.22.0 (16 March 2025)
+++++++++++++++++++++++++++
+
+New features
+---------------
+* Added support for HPKE (RFC 9180).
+
+Resolved issues
+---------------
+* GH#812: CCM ciphers will now fail before encrypting (or decrypting)
+  data beyond the limit imposed by the nonce length.
+* GH#846: fix infinite loop with RC4 for data larger than 4GB.
+* GH#852: handle correctly invalid PEM files with less than 3 lines.
+
+Other changes
+-------------
+* Remove support for Python 3.6.
+
 3.21.0 (30 September 2024)
 ++++++++++++++++++++++++++
 

Doc/Makefile

@@ -14,7 +14,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp latex latexpdf text man changes linkcheck doctest gettext
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -26,7 +26,6 @@ help:
 	@echo "  htmlhelp   to make HTML files and a HTML help project"
 	@echo "  qthelp     to make HTML files and a qthelp project"
 	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
 	@echo "  text       to make text files"
@@ -90,11 +89,6 @@ devhelp:
 	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PyCryptodome"
 	@echo "# devhelp"
 
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo

Doc/conf.py

@@ -54,13 +54,14 @@ def have_aes_ni(self):
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.napoleon',
-        'sphinx.ext.mathjax' ]
+               'sphinx.ext.mathjax', 'sphinx_autodoc_typehints',
+               'sphinx_rtd_theme' ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = {'.rst': 'restructuredtext'}
 
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
@@ -70,7 +71,7 @@ def have_aes_ni(self):
 
 # General information about the project.
 project = 'PyCryptodome'
-copyright = '2022, Helder Eijs'
+copyright = '2025, Helder Eijs'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

Doc/index.rst

@@ -3,7 +3,7 @@ Welcome to PyCryptodome's documentation
 
 .. toctree::
    :maxdepth: 3
-   
+
    src/introduction
    src/features
    src/installation
@@ -12,6 +12,5 @@ Welcome to PyCryptodome's documentation
    src/examples
    src/faq
    src/contribute_support
-   src/future
    src/changelog
    src/license

Doc/reqs.txt

@@ -0,0 +1,3 @@
+sphinx==8.2.3
+sphinx-autodoc-typehints==3.1.0
+sphinx-rtd-theme