Merge branch 'master' into rishav/slack-notification

Author: rishav-karanjit

.github/workflows/ci_static-analysis.yaml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: '3.10'
       - run: |
           python -m pip install --upgrade pip
           pip install --upgrade -r dev_requirements/ci-requirements.txt

.github/workflows/ci_test-vector-handler.yaml

@@ -79,7 +79,7 @@ jobs:
         - uses: actions/checkout@v4
         - uses: actions/setup-python@v4
           with:
-            python-version: 3.9
+            python-version: '3.10'
         - run: |
             python -m pip install --upgrade pip
             pip install --upgrade -r dev_requirements/ci-requirements.txt

CHANGELOG.rst

@@ -2,6 +2,16 @@
 Changelog
 *********
 
+4.0.4 -- 2025-09-03
+===================
+
+Maintenance
+-----------
+* deps: Extend supported `MPL`_ versions to include v1.11.2
+  `#788 <https://github.com/aws/aws-encryption-sdk-python/pull/788>`_
+
+  MPL v1.11.2 fixes de-serializing Error_OpaqueWithText
+
 4.0.3 -- 2025-09-03
 ===================
 

dev_requirements/linter-requirements.txt

@@ -11,4 +11,5 @@ pyflakes==2.4.0
 pylint==2.13.5
 readme_renderer==37.3
 seed-isort-config==2.2.0
+setuptools==81.0.0
 vulture==2.9.1

performance_tests/README.rst

@@ -49,7 +49,7 @@ Required Prerequisites
 Recommended Prerequisites
 =========================
 
-* aws-cryptographic-material-providers: == 1.11.1
+* aws-cryptographic-material-providers: == 1.11.2
   * Requires Python 3.11+.
 
 *****

requirements_mpl.txt

@@ -1 +1 @@
-aws-cryptographic-material-providers>=1.7.4,<=1.11.1
+aws-cryptographic-material-providers>=1.7.4,<=1.11.2

setup.py

@@ -43,7 +43,7 @@ def get_requirements():
     license="Apache License 2.0",
     install_requires=get_requirements(),
     extras_require={
-        "MPL": ["aws-cryptographic-material-providers>=1.7.4,<=1.11.1"],
+        "MPL": ["aws-cryptographic-material-providers>=1.7.4,<=1.11.2"],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",

src/aws_encryption_sdk/identifiers.py

@@ -17,7 +17,7 @@
     # We only actually need these imports when running the mypy checks
     pass
 
-__version__ = "4.0.3"
+__version__ = "4.0.4"
 USER_AGENT_SUFFIX = "AwsEncryptionSdkPython/{}".format(__version__)
 
 

test/unit/test_crypto.py

@@ -36,14 +36,6 @@
         b"\n:\xcaD\x1f)\xde\xf73\x9a!/x#(z\xf8/\x83\xeb\r&\x7f&\xb4\xeb\xc1\x1b\xe9\x91I\xf5\x8a\xb6\xee\xaf\x08\xb9"
         b"\xa5\xe1S\xb2Gw\x15(\xb6\xe1"
     ),
-    "ecc_private_key_char2": ec.EllipticCurvePrivateNumbers(
-        private_value=131512833187976200862897177240257889476359607892474090119002870596121284569326171944650239612201181144875264734209664973820,  # noqa pylint: disable=line-too-long
-        public_numbers=ec.EllipticCurvePublicNumbers(
-            x=783372629152728216190118671643020486604880277607267246139026062120084499867233383227220456289236528291350315438332972681898,  # noqa pylint: disable=line-too-long
-            y=657053766035459398820670308946963262342583342616783849689721971058264156234178067988487273332138651529574836305189297847674,  # noqa pylint: disable=line-too-long
-            curve=ec.SECT409K1(),
-        ),
-    ).private_key(default_backend()),
 }
 VALUES["ciphertext"] = VALUES["encryptor"]["update"] + VALUES["encryptor"]["finalize"]
 VALUES["plaintext"] = VALUES["decryptor"]["update"] + VALUES["decryptor"]["finalize"]

test/unit/test_crypto_elliptic_curve.py

@@ -287,13 +287,6 @@ def test_ecc_encode_compressed_point_prime():
     assert compressed_point == VALUES["ecc_compressed_point"]
 
 
-def test_ecc_encode_compressed_point_characteristic_two():
-    with pytest.raises(NotSupportedError) as excinfo:
-        _ecc_encode_compressed_point(VALUES["ecc_private_key_char2"])
-
-    excinfo.match(r"Non-prime curves are not supported at this time")
-
-
 def test_ecc_decode_compressed_point_infinity():
     with pytest.raises(NotSupportedError) as excinfo:
         _ecc_decode_compressed_point(curve=ec.SECP384R1(), compressed_point=b"")
@@ -343,13 +336,6 @@ def test_ecc_decode_compressed_point_prime_complex(patch_ecc_curve_parameters):
     excinfo.match(r"S not 1 :: Curve not supported at this time")
 
 
-def test_ecc_decode_compressed_point_nonprime_characteristic_two():
-    with pytest.raises(NotSupportedError) as excinfo:
-        _ecc_decode_compressed_point(curve=ec.SECT409K1(), compressed_point="\x02skdgaiuhgijudflkjsdgfkjsdflgjhsd")
-
-    excinfo.match(r"Non-prime curves are not supported at this time")
-
-
 def test_ecc_public_numbers_from_compressed_point(patch_ec, patch_ecc_decode_compressed_point):
     patch_ecc_decode_compressed_point.return_value = sentinel.x, sentinel.y
     patch_ec.EllipticCurvePublicNumbers.return_value = sentinel.public_numbers_instance