chore(Python): Merge in remaining changes

.releaserc.cjs

@@ -55,7 +55,12 @@ const Runtimes = {
   // must be accounted for in `CheckDependencyReplacementResults`.
   python: {
     "AwsCryptographicMaterialProviders/runtimes/python/pyproject.toml": {
-      dependencies: ["AwsCryptographyPrimitives", "ComAmazonawsKms", "ComAmazonawsDynamodb", "StandardLibrary"],
+      dependencies: [
+        "AwsCryptographyPrimitives",
+        "ComAmazonawsKms",
+        "ComAmazonawsDynamodb",
+        "StandardLibrary",
+      ],
     },
     "AwsCryptographyPrimitives/runtimes/python/pyproject.toml": {
       dependencies: ["StandardLibrary"],
@@ -148,15 +153,17 @@ module.exports = {
             to: 'version = "${nextRelease.version}"',
             results: Object.keys(Runtimes.python).map(CheckResults),
             countMatches: true,
-          },    
+          },
 
           // Now update the local filesystem dependencies to PyPI dependencies
           // pinned to the minor MPL version
           {
             files: Object.keys(Runtimes.python),
             from: "{path =.*",
-            to: "\"~${nextRelease.version}\"",
-            results: Object.keys(Runtimes.python).map(CheckDependencyReplacementResults),
+            to: '"~${nextRelease.version}"',
+            results: Object.keys(Runtimes.python).map(
+              CheckDependencyReplacementResults,
+            ),
             countMatches: true,
           },
         ],
@@ -166,7 +173,8 @@ module.exports = {
       // Re-transpile Python code to update .dtr files as part of the release commit
       "@semantic-release/exec",
       {
-        "prepareCmd": "make -C TestVectorsAwsCryptographicMaterialProviders transpile_python"
+        prepareCmd:
+          "make -C TestVectorsAwsCryptographicMaterialProviders transpile_python",
       },
     ],
     // Commit and push changes the changelog and versions bumps
@@ -235,6 +243,8 @@ function CheckDependencyReplacementResults(file) {
       numReplacements: 1,
     };
   } else {
-    throw new Error(`No known dependency replacement result specification for file ${file}`)
+    throw new Error(
+      `No known dependency replacement result specification for file ${file}`,
+    );
   }
-}
+}

AwsCryptographyPrimitives/test/TestECDH.dfy

@@ -128,10 +128,12 @@ module TestECDH {
   const INFINITY_POINT_ERR_MSG_JAVA := "encoded key spec not recognized: Point at infinity"
   const INFINITY_POINT_ERR_MSG_NET6 := "Point at infinity (Parameter 'q')"
   const INFINITY_POINT_ERR_MSG_NET48 := "Point at infinity\r\nParameter name: q"
+  const INFINITY_POINT_ERR_MSG_PYTHON := "Unable to load EC key"
 
   const OUT_OF_BOUNDS_ERR_MSG_JAVA := "encoded key spec not recognized: x value invalid for"
   const OUT_OF_BOUNDS_ERR_MSG_NET6 := "value invalid for Fp field element (Parameter 'x')"
   const OUT_OF_BOUNDS_ERR_MSG_NE48 := "value invalid for Fp field element\r\nParameter name: x"
+  const OUT_OF_BOUNDS_ERR_MSG_PYTHON := "Could not deserialize key data. The data may be in an incorrect format"
 
   // Rust does not provide a separate error message for infinity or out of bounds
   const BAD_X509_KEY_ERR_MSG_RUST := "Invalid X509 Public Key."
@@ -300,7 +302,8 @@ module TestECDH {
           errMsg == BAD_X509_KEY_ERR_MSG_RUST ||
           errMsg == INFINITY_POINT_ERR_MSG_JAVA ||
           errMsg == INFINITY_POINT_ERR_MSG_NET6 ||
-          errMsg == INFINITY_POINT_ERR_MSG_NET48
+          errMsg == INFINITY_POINT_ERR_MSG_NET48 ||
+          seq_contains(errMsg, INFINITY_POINT_ERR_MSG_PYTHON)
         );
     }
   }
@@ -349,7 +352,8 @@ module TestECDH {
           seq_contains(errMsg, OUT_OF_BOUNDS_ERR_MSG_JAVA) ||
           errMsg == BAD_X509_KEY_ERR_MSG_RUST ||
           errMsg == OUT_OF_BOUNDS_ERR_MSG_NET6 ||
-          errMsg == OUT_OF_BOUNDS_ERR_MSG_NE48
+          errMsg == OUT_OF_BOUNDS_ERR_MSG_NE48 ||
+          seq_contains(errMsg, OUT_OF_BOUNDS_ERR_MSG_PYTHON)
         );
     }
   }
@@ -517,7 +521,8 @@ module TestECDH {
           errMsg == INFINITY_POINT_ERR_MSG_JAVA ||
           errMsg == BAD_X509_KEY_ERR_MSG_RUST ||
           errMsg == INFINITY_POINT_ERR_MSG_NET6 ||
-          errMsg == INFINITY_POINT_ERR_MSG_NET48
+          errMsg == INFINITY_POINT_ERR_MSG_NET48 ||
+          seq_contains(errMsg, INFINITY_POINT_ERR_MSG_PYTHON)
         );
     }
   }
@@ -544,7 +549,8 @@ module TestECDH {
           seq_contains(errMsg, OUT_OF_BOUNDS_ERR_MSG_JAVA) ||
           errMsg == BAD_X509_KEY_ERR_MSG_RUST ||
           errMsg == OUT_OF_BOUNDS_ERR_MSG_NET6 ||
-          errMsg == OUT_OF_BOUNDS_ERR_MSG_NE48
+          errMsg == OUT_OF_BOUNDS_ERR_MSG_NE48 ||
+          seq_contains(errMsg, OUT_OF_BOUNDS_ERR_MSG_PYTHON)
         );
     }