Fixes #10294 -- correct accidental change to exchange kwarg (#10295) (#…

…10296)
pyca · Jan 30, 2024 · 002e886 · 002e886
1 parent 92fa9f2
commit 002e886
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/rust/src/backend/dh.rs b/src/rust/src/backend/dh.rs
@@ -154,11 +154,11 @@ impl DHPrivateKey {
     fn exchange<'p>(
         &self,
         py: pyo3::Python<'p>,
-        public_key: &DHPublicKey,
+        peer_public_key: &DHPublicKey,
     ) -> CryptographyResult<&'p pyo3::types::PyBytes> {
         let mut deriver = openssl::derive::Deriver::new(&self.pkey)?;
         deriver
-            .set_peer(&public_key.pkey)
+            .set_peer(&peer_public_key.pkey)
             .map_err(|_| pyo3::exceptions::PyValueError::new_err("Error computing shared key."))?;
 
         Ok(pyo3::types::PyBytes::new_with(py, deriver.len()?, |b| {

diff --git a/src/rust/src/backend/ec.rs b/src/rust/src/backend/ec.rs
@@ -232,7 +232,7 @@ impl ECPrivateKey {
         &self,
         py: pyo3::Python<'p>,
         algorithm: &pyo3::PyAny,
-        public_key: &ECPublicKey,
+        peer_public_key: &ECPublicKey,
     ) -> CryptographyResult<&'p pyo3::types::PyBytes> {
         if !algorithm.is_instance(types::ECDH.get(py)?)? {
             return Err(CryptographyError::from(
@@ -249,12 +249,12 @@ impl ECPrivateKey {
         // ECPublicKey object.
         #[cfg(CRYPTOGRAPHY_OPENSSL_300_OR_GREATER)]
         deriver
-            .set_peer_ex(&public_key.pkey, false)
+            .set_peer_ex(&peer_public_key.pkey, false)
             .map_err(|_| pyo3::exceptions::PyValueError::new_err("Error computing shared key."))?;
 
         #[cfg(not(CRYPTOGRAPHY_OPENSSL_300_OR_GREATER))]
         deriver
-            .set_peer(&public_key.pkey)
+            .set_peer(&peer_public_key.pkey)
             .map_err(|_| pyo3::exceptions::PyValueError::new_err("Error computing shared key."))?;
 
         Ok(pyo3::types::PyBytes::new_with(py, deriver.len()?, |b| {

diff --git a/src/rust/src/backend/x25519.rs b/src/rust/src/backend/x25519.rs
@@ -65,10 +65,10 @@ impl X25519PrivateKey {
     fn exchange<'p>(
         &self,
         py: pyo3::Python<'p>,
-        public_key: &X25519PublicKey,
+        peer_public_key: &X25519PublicKey,
     ) -> CryptographyResult<&'p pyo3::types::PyBytes> {
         let mut deriver = openssl::derive::Deriver::new(&self.pkey)?;
-        deriver.set_peer(&public_key.pkey)?;
+        deriver.set_peer(&peer_public_key.pkey)?;
 
         Ok(pyo3::types::PyBytes::new_with(py, deriver.len()?, |b| {
             let n = deriver.derive(b).map_err(|_| {

diff --git a/src/rust/src/backend/x448.rs b/src/rust/src/backend/x448.rs
@@ -64,10 +64,10 @@ impl X448PrivateKey {
     fn exchange<'p>(
         &self,
         py: pyo3::Python<'p>,
-        public_key: &X448PublicKey,
+        peer_public_key: &X448PublicKey,
     ) -> CryptographyResult<&'p pyo3::types::PyBytes> {
         let mut deriver = openssl::derive::Deriver::new(&self.pkey)?;
-        deriver.set_peer(&public_key.pkey)?;
+        deriver.set_peer(&peer_public_key.pkey)?;
 
         Ok(pyo3::types::PyBytes::new_with(py, deriver.len()?, |b| {
             let n = deriver.derive(b).map_err(|_| {