Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 27 insertions, 19 deletions

diff --git a/vendor/elliptic-curve/.cargo-checksum.json b/vendor/elliptic-curve/.cargo-checksum.json
index debf7676b..7b2ffb74e 100644
--- a/vendor/elliptic-curve/.cargo-checksum.json
+++ b/vendor/elliptic-curve/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"6a56740f7a55940755a4df071f130ceaf8aab30ca087c8e49e33e4eb2a69664b","Cargo.toml":"199892910e6345c3ef27bbf88ba1e80e4b7f817a834a23a437ef3b5fc4ffccf0","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"d27687b51f2874822c1530976b7e837eac4f308d94bf3dd42047011b7d437b47","README.md":"1ec3f5114bbba41528da8017c76a5d7f5cd995ae444705c279b776eeea350216","src/arithmetic.rs":"55be3c0cefb168a0768af743974007707ce95e98e89281818db9b69b4ba8f9cd","src/dev.rs":"f0268281f744e481b2e9eae129c93390cd94fe4cb88f62d1920204238dc40537","src/ecdh.rs":"5cc59b8a2a5397be43deba006ca9d9fc608be1676d80c1f5c017af66bf72ad98","src/error.rs":"8aedd93298b729ee396bc1a31754119130fbf865cb1e330c65be178cbbb0d1e4","src/field.rs":"ffc3897dfb36f8d27de7ce96269cae4541b4587c4d9c94a9ce6d177819036624","src/hash2curve.rs":"861857145cc973ca64fc765731dada9aa3d7d97f61d324f6dba2aacc2d5e2135","src/hash2curve/group_digest.rs":"b9b52633c72158475bb059a1a36f61f04c8aa56a9188a83bcd6671996e5d4725","src/hash2curve/hash2field.rs":"762f662fa018db76af9bbae04e44a68e1279a638699648448ae1a28a51607150","src/hash2curve/hash2field/expand_msg.rs":"7615b8d2ba958a6d11d0f50143b9c2aa78649ea7c2dd87d16f2da4cf09578e50","src/hash2curve/hash2field/expand_msg/xmd.rs":"6c955cfae4f6f867a1d3ed50ce9aae736d50c1c2707c99dfe4ab0b810357f643","src/hash2curve/hash2field/expand_msg/xof.rs":"6c063410481ac6e9c69ab8739ef8e95de314e58bd798e23fe632bc5e709ab93b","src/hash2curve/isogeny.rs":"675f619968908279df73666884e58d9754c526056179767439de1f9b9e58a70d","src/hash2curve/map2curve.rs":"fc05c553ccd92de762e083f02079581376e8e4a193acd0d902cfdb33f59ce10a","src/hash2curve/osswu.rs":"184d5bee8669722e9ef20523c064b3a769be49a6b62c4827818894199be94820","src/jwk.rs":"d2b345d203dc7856f6142cdd2e3d34dc174bd88bd9c703bd1d09c992c63c4672","src/lib.rs":"841b248d78c0dfa1a0dc79472350191786507871f0bad8e83bd01eaaff48670a","src/ops.rs":"59f4c881e04e4afab3d742f78eb932cc82e400b1f43f26dc4eacce5ea57a586b","src/point.rs":"05146dbf03deb0c18e62ffa47b06bae58639cb96473440cc192e9ed4af8c74b1","src/point/non_identity.rs":"80a2b46aa22d5824a6f06d6f7855cb51285b7fa4dfeaa1eb05f3e57e390f33db","src/public_key.rs":"65d61b79c58dd516ab05a47914c976c2078dc4caaf9d1dc3eb6c3479404cea20","src/scalar.rs":"0702d705b63732f62b6a7eaaf630ee5007b81623c0b0722e9712aa82f762fcd5","src/scalar/blinded.rs":"a6e7656c934eea2048e8047a5b13889b3344f5e54083d90e1d85839471155f26","src/scalar/nonzero.rs":"e485dad71df0e161a354ab9998ed155f3ae19a63be5b41d5c368fe942a21d329","src/scalar/primitive.rs":"19363dfc72b339c06e41ea60a1205fed5f301e7ec144feee22ea05a9c3aa4576","src/sec1.rs":"0a3970cc745cf096106a033ea9691d40f99db1e4ed038790b6c319535876b6ed","src/secret_key.rs":"fc94db580e10b040155d7181662a2fef81e24b5446f5523169cf72ab545974dd","src/secret_key/pkcs8.rs":"26b9171c1c7c0321419425188b3d317624040161f29e5521a250299ebcbfd536","src/voprf.rs":"d6a7d8596163bbab3d183526ffa8882bb4de279772f992dc2d261cce6d17efba","src/weierstrass.rs":"b49e30b886ca5ee8a6725fa34d5c58108ee844888b73e5983856c7e2740bc9e2","tests/examples/pkcs8-private-key.der":"8125ab208d2181ed3ef05ff0ab1906e5898c36a858277e5b987e78e505288769","tests/examples/pkcs8-private-key.pem":"e0d0ce22e72577e5d00d7b8d65288f158032402fc9dbcaf63dc771d0eb91ae5f","tests/examples/pkcs8-public-key.der":"b9968d56ed8d6aa3fb43b15fa01e355d7a3a0203b1408b3fd2733637c4d1642c","tests/examples/pkcs8-public-key.pem":"d1ff198dc495da63f5f909db0254d6e49cff519487fcb26d055a762fc3ca47a1","tests/pkcs8.rs":"b69f29997a46fe4be1bf5b7b27b9efa501403b4a9fc8fa9733144f94d9683501","tests/secret_key.rs":"2940d742fa95a3ef9a129deaaad0fdb22123f427f39014e19056238ff883efe5"},"package":"75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"ffd3a00902a17da8a53ceff6de41770ccb8732a9c55d68eb79f056068669bc93","Cargo.toml":"f6ee09cf092f83c90d0bb859f8349884d8f59404f9f8814f8a6e0e038e3506c5","LICENSE-APACHE":"a9040321c3712d8fd0b09cf52b17445de04a23a10165049ae187cd39e5c86be5","LICENSE-MIT":"d27687b51f2874822c1530976b7e837eac4f308d94bf3dd42047011b7d437b47","README.md":"1ec3f5114bbba41528da8017c76a5d7f5cd995ae444705c279b776eeea350216","src/arithmetic.rs":"55be3c0cefb168a0768af743974007707ce95e98e89281818db9b69b4ba8f9cd","src/dev.rs":"f0268281f744e481b2e9eae129c93390cd94fe4cb88f62d1920204238dc40537","src/ecdh.rs":"5cc59b8a2a5397be43deba006ca9d9fc608be1676d80c1f5c017af66bf72ad98","src/error.rs":"8aedd93298b729ee396bc1a31754119130fbf865cb1e330c65be178cbbb0d1e4","src/field.rs":"ffc3897dfb36f8d27de7ce96269cae4541b4587c4d9c94a9ce6d177819036624","src/hash2curve.rs":"861857145cc973ca64fc765731dada9aa3d7d97f61d324f6dba2aacc2d5e2135","src/hash2curve/group_digest.rs":"b9b52633c72158475bb059a1a36f61f04c8aa56a9188a83bcd6671996e5d4725","src/hash2curve/hash2field.rs":"762f662fa018db76af9bbae04e44a68e1279a638699648448ae1a28a51607150","src/hash2curve/hash2field/expand_msg.rs":"7615b8d2ba958a6d11d0f50143b9c2aa78649ea7c2dd87d16f2da4cf09578e50","src/hash2curve/hash2field/expand_msg/xmd.rs":"6c955cfae4f6f867a1d3ed50ce9aae736d50c1c2707c99dfe4ab0b810357f643","src/hash2curve/hash2field/expand_msg/xof.rs":"6c063410481ac6e9c69ab8739ef8e95de314e58bd798e23fe632bc5e709ab93b","src/hash2curve/isogeny.rs":"675f619968908279df73666884e58d9754c526056179767439de1f9b9e58a70d","src/hash2curve/map2curve.rs":"fc05c553ccd92de762e083f02079581376e8e4a193acd0d902cfdb33f59ce10a","src/hash2curve/osswu.rs":"184d5bee8669722e9ef20523c064b3a769be49a6b62c4827818894199be94820","src/jwk.rs":"d2b345d203dc7856f6142cdd2e3d34dc174bd88bd9c703bd1d09c992c63c4672","src/lib.rs":"841b248d78c0dfa1a0dc79472350191786507871f0bad8e83bd01eaaff48670a","src/ops.rs":"59f4c881e04e4afab3d742f78eb932cc82e400b1f43f26dc4eacce5ea57a586b","src/point.rs":"05146dbf03deb0c18e62ffa47b06bae58639cb96473440cc192e9ed4af8c74b1","src/point/non_identity.rs":"80a2b46aa22d5824a6f06d6f7855cb51285b7fa4dfeaa1eb05f3e57e390f33db","src/public_key.rs":"ec507d4c5e41f576d61045c2d1312e20b75c84f4162307a319ac520326d5cae0","src/scalar.rs":"0702d705b63732f62b6a7eaaf630ee5007b81623c0b0722e9712aa82f762fcd5","src/scalar/blinded.rs":"a6e7656c934eea2048e8047a5b13889b3344f5e54083d90e1d85839471155f26","src/scalar/nonzero.rs":"e485dad71df0e161a354ab9998ed155f3ae19a63be5b41d5c368fe942a21d329","src/scalar/primitive.rs":"19363dfc72b339c06e41ea60a1205fed5f301e7ec144feee22ea05a9c3aa4576","src/sec1.rs":"0a3970cc745cf096106a033ea9691d40f99db1e4ed038790b6c319535876b6ed","src/secret_key.rs":"7f553e820d46e57bc16ee9ebf17cb0eb07585fea1db57bc310f350ff2fba4759","src/secret_key/pkcs8.rs":"26b9171c1c7c0321419425188b3d317624040161f29e5521a250299ebcbfd536","src/voprf.rs":"d6a7d8596163bbab3d183526ffa8882bb4de279772f992dc2d261cce6d17efba","src/weierstrass.rs":"b49e30b886ca5ee8a6725fa34d5c58108ee844888b73e5983856c7e2740bc9e2","tests/examples/pkcs8-private-key.der":"8125ab208d2181ed3ef05ff0ab1906e5898c36a858277e5b987e78e505288769","tests/examples/pkcs8-private-key.pem":"e0d0ce22e72577e5d00d7b8d65288f158032402fc9dbcaf63dc771d0eb91ae5f","tests/examples/pkcs8-public-key.der":"b9968d56ed8d6aa3fb43b15fa01e355d7a3a0203b1408b3fd2733637c4d1642c","tests/examples/pkcs8-public-key.pem":"d1ff198dc495da63f5f909db0254d6e49cff519487fcb26d055a762fc3ca47a1","tests/pkcs8.rs":"b69f29997a46fe4be1bf5b7b27b9efa501403b4a9fc8fa9733144f94d9683501","tests/secret_key.rs":"2940d742fa95a3ef9a129deaaad0fdb22123f427f39014e19056238ff883efe5"},"package":"968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"}
\ No newline at end of file
diff --git a/vendor/elliptic-curve/CHANGELOG.md b/vendor/elliptic-curve/CHANGELOG.md
index a6128cd91..62b62eb09 100644
--- a/vendor/elliptic-curve/CHANGELOG.md
+++ b/vendor/elliptic-curve/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.13.5 (2023-05-19)
+### Changed
+- Faster `PublicKey::from_encoded_point` ([#1310])
+
+### Fixed
+- `alloc`+`arithmetic` features w/o `sec1` feature ([#1301])
+
+[#1301]: https://github.com/RustCrypto/traits/pull/1301
+[#1310]: https://github.com/RustCrypto/traits/pull/1310
+
 ## 0.13.4 (2023-04-08)
 ### Changed
 - Bump `hex-literal` to v0.4 ([#1295])
diff --git a/vendor/elliptic-curve/Cargo.toml b/vendor/elliptic-curve/Cargo.toml
index 03aab967c..688c1ecfc 100644
--- a/vendor/elliptic-curve/Cargo.toml
+++ b/vendor/elliptic-curve/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.65"
 name = "elliptic-curve"
-version = "0.13.4"
+version = "0.13.5"
 authors = ["RustCrypto Developers"]
 description = """
 General purpose Elliptic Curve Cryptography (ECC) support, including types
diff --git a/vendor/elliptic-curve/src/public_key.rs b/vendor/elliptic-curve/src/public_key.rs
index e2d71b3f0..485b0ecfd 100644
--- a/vendor/elliptic-curve/src/public_key.rs
+++ b/vendor/elliptic-curve/src/public_key.rs
@@ -6,9 +6,6 @@ use crate::{
 use core::fmt::Debug;
 use group::{Curve, Group};
 
-#[cfg(feature = "alloc")]
-use alloc::boxed::Box;
-
 #[cfg(feature = "jwk")]
 use crate::{JwkEcKey, JwkParameters};
 
@@ -26,12 +23,15 @@ use {
         FieldBytesSize,
     },
     core::cmp::Ordering,
-    subtle::CtOption,
+    subtle::{Choice, CtOption},
 };
 
 #[cfg(all(feature = "alloc", feature = "pkcs8"))]
 use pkcs8::EncodePublicKey;
 
+#[cfg(all(feature = "alloc", feature = "sec1"))]
+use alloc::boxed::Box;
+
 #[cfg(any(feature = "jwk", feature = "pem"))]
 use alloc::string::{String, ToString};
 
@@ -138,7 +138,7 @@ where
     /// (page 10).
     ///
     /// <http://www.secg.org/sec1-v2.pdf>
-    #[cfg(feature = "alloc")]
+    #[cfg(all(feature = "alloc", feature = "sec1"))]
     pub fn to_sec1_bytes(&self) -> Box<[u8]>
     where
         C: PointCompression,
@@ -231,7 +231,7 @@ where
     /// Initialize [`PublicKey`] from an [`EncodedPoint`]
     fn from_encoded_point(encoded_point: &EncodedPoint<C>) -> CtOption<Self> {
         AffinePoint::<C>::from_encoded_point(encoded_point).and_then(|point| {
-            let is_identity = ProjectivePoint::<C>::from(point).is_identity();
+            let is_identity = Choice::from(encoded_point.is_identity() as u8);
             CtOption::new(PublicKey { point }, !is_identity)
         })
     }
diff --git a/vendor/elliptic-curve/src/secret_key.rs b/vendor/elliptic-curve/src/secret_key.rs
index 97b3d58bd..a8da65ccd 100644
--- a/vendor/elliptic-curve/src/secret_key.rs
+++ b/vendor/elliptic-curve/src/secret_key.rs
@@ -14,16 +14,6 @@ use generic_array::typenum::Unsigned;
 use subtle::{Choice, ConstantTimeEq};
 use zeroize::{Zeroize, ZeroizeOnDrop};
 
-#[cfg(all(feature = "alloc", feature = "arithmetic"))]
-use {
-    crate::{
-        sec1::{FromEncodedPoint, ToEncodedPoint},
-        AffinePoint,
-    },
-    alloc::vec::Vec,
-    zeroize::Zeroizing,
-};
-
 #[cfg(feature = "arithmetic")]
 use crate::{rand_core::CryptoRngCore, CurveArithmetic, NonZeroScalar, PublicKey};
 
@@ -34,7 +24,15 @@ use crate::jwk::{JwkEcKey, JwkParameters};
 use sec1::der;
 
 #[cfg(all(feature = "alloc", feature = "arithmetic", feature = "sec1"))]
-use sec1::der::Encode;
+use {
+    crate::{
+        sec1::{FromEncodedPoint, ToEncodedPoint},
+        AffinePoint,
+    },
+    alloc::vec::Vec,
+    sec1::der::Encode,
+    zeroize::Zeroizing,
+};
 
 #[cfg(all(feature = "arithmetic", any(feature = "jwk", feature = "pem")))]
 use alloc::string::String;