Adding upstream version 0.70.1+ds1.upstream/0.70.1+ds1upstream

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

5 files changed, 91 insertions, 0 deletions

diff --git a/vendor/p384/debian/patches/disable-benches.patch b/vendor/p384/debian/patches/disable-benches.patch
new file mode 100644
index 0000000..8bc5906
--- /dev/null
+++ b/vendor/p384/debian/patches/disable-benches.patch
@@ -0,0 +1,28 @@
+Index: p384/Cargo.toml
+===================================================================
+--- p384.orig/Cargo.toml
++++ p384/Cargo.toml
+@@ -37,6 +37,7 @@ categories = [
+ ]
+ license = "Apache-2.0 OR MIT"
+ repository = "https://github.com/RustCrypto/elliptic-curves/tree/master/p384"
++autobenches = false
+ 
+ [package.metadata.docs.rs]
+ rustdoc-args = [
+@@ -44,15 +45,6 @@ rustdoc-args = [
+     "docsrs",
+ ]
+ 
+-[[bench]]
+-name = "field"
+-harness = false
+-required-features = ["expose-field"]
+-
+-[[bench]]
+-name = "scalar"
+-harness = false
+-
+ [dependencies.ecdsa-core]
+ version = "0.16"
+ features = ["der"]
diff --git a/vendor/p384/debian/patches/fix-tests.patch b/vendor/p384/debian/patches/fix-tests.patch
new file mode 100644
index 0000000..5c1a7d6
--- /dev/null
+++ b/vendor/p384/debian/patches/fix-tests.patch
@@ -0,0 +1,15 @@
+Index: p384/src/arithmetic/hash2curve.rs
+===================================================================
+--- p384.orig/src/arithmetic/hash2curve.rs
++++ p384/src/arithmetic/hash2curve.rs
+@@ -99,8 +99,9 @@ impl FromOkm for Scalar {
+ }
+ 
+ #[cfg(test)]
++#[cfg(feature = "sha2")]
+ mod tests {
+-    use crate::{FieldElement, NistP384, Scalar};
++    use crate::{arithmetic::FieldElement, NistP384, Scalar};
+     use elliptic_curve::{
+         bigint::{ArrayEncoding, NonZero, U384, U576},
+         consts::U72,
diff --git a/vendor/p384/debian/patches/relax-hex-literal.patch b/vendor/p384/debian/patches/relax-hex-literal.patch
new file mode 100644
index 0000000..7fc8364
--- /dev/null
+++ b/vendor/p384/debian/patches/relax-hex-literal.patch
@@ -0,0 +1,22 @@
+Index: p384/Cargo.toml
+===================================================================
+--- p384.orig/Cargo.toml
++++ p384/Cargo.toml
+@@ -69,7 +69,7 @@ features = [
+ default-features = false
+ 
+ [dependencies.hex-literal]
+-version = "0.3"
++version = "0.4"
+ optional = true
+ 
+ [dependencies.primeorder]
+@@ -98,7 +98,7 @@ default-features = false
+ package = "ecdsa"
+ 
+ [dev-dependencies.hex-literal]
+-version = "0.3"
++version = "0.4"
+ 
+ [dev-dependencies.proptest]
+ version = "1.1"
diff --git a/vendor/p384/debian/patches/relax-test-deps.patch b/vendor/p384/debian/patches/relax-test-deps.patch
new file mode 100644
index 0000000..889b896
--- /dev/null
+++ b/vendor/p384/debian/patches/relax-test-deps.patch
@@ -0,0 +1,22 @@
+Index: p384/Cargo.toml
+===================================================================
+--- p384.orig/Cargo.toml
++++ p384/Cargo.toml
+@@ -89,7 +89,7 @@ default-features = false
+ version = "0.3"
+ 
+ [dev-dependencies.criterion]
+-version = "0.4"
++version = "0.5"
+ 
+ [dev-dependencies.ecdsa-core]
+ version = "0.16"
+@@ -101,7 +101,7 @@ package = "ecdsa"
+ version = "0.4"
+ 
+ [dev-dependencies.proptest]
+-version = "1.1"
++version = "1.0"
+ 
+ [dev-dependencies.rand_core]
+ version = "0.6"
diff --git a/vendor/p384/debian/patches/series b/vendor/p384/debian/patches/series
new file mode 100644
index 0000000..3a6a184
--- /dev/null
+++ b/vendor/p384/debian/patches/series
@@ -0,0 +1,4 @@
+relax-hex-literal.patch
+relax-test-deps.patch
+disable-benches.patch
+fix-tests.patch