Bump hybrid-array to v0.4 (#1385)

Author: tarcieri

Cargo.lock

@@ -22,10 +22,13 @@ members = [
 opt-level = 2
 
 [patch.crates-io]
+block-buffer = { git = "https://github.com/RustCrypto/utils" }
 crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint" }
-
+crypto-common = { git = "https://github.com/RustCrypto/traits" }
+digest = { git = "https://github.com/RustCrypto/traits" }
 elliptic-curve = { git = "https://github.com/RustCrypto/traits.git" }
-ecdsa          = { git = "https://github.com/RustCrypto/signatures.git" }
+ecdsa = { git = "https://github.com/RustCrypto/signatures.git" }
+sec1 = { git = "https://github.com/RustCrypto/formats", branch = "sec1/hybrid-array-v0.4" }
 
 ed448-goldilocks = { path = "ed448-goldilocks" }
 hash2curve = { path = "hash2curve" }

Cargo.toml

@@ -3,20 +3,21 @@
 use criterion::{
     BenchmarkGroup, Criterion, criterion_group, criterion_main, measurement::Measurement,
 };
+use elliptic_curve::array::Array;
 use hex_literal::hex;
 use p256::FieldElement;
 
 fn test_field_element_x() -> FieldElement {
-    FieldElement::from_bytes(
-        hex!("1ccbe91c075fc7f4f033bfa248db8fccd3565de94bbfb12f3c59ff46c271bf83").as_ref(),
-    )
+    FieldElement::from_bytes(&Array(hex!(
+        "1ccbe91c075fc7f4f033bfa248db8fccd3565de94bbfb12f3c59ff46c271bf83"
+    )))
     .unwrap()
 }
 
 fn test_field_element_y() -> FieldElement {
-    FieldElement::from_bytes(
-        hex!("ce4014c68811f9a21a1fdb2c0e6113e06db7ca93b7404e78dc7ccd5ca89a4ca9").as_ref(),
-    )
+    FieldElement::from_bytes(&Array(hex!(
+        "ce4014c68811f9a21a1fdb2c0e6113e06db7ca93b7404e78dc7ccd5ca89a4ca9"
+    )))
     .unwrap()
 }
 

p256/benches/field.rs

@@ -196,6 +196,7 @@ impl PrimeField for FieldElement {
 mod tests {
     use super::FieldElement;
     use crate::{FieldBytes, U256, test_vectors::field::DBL_TEST_VECTORS};
+    use elliptic_curve::array::Array;
 
     #[cfg(target_pointer_width = "64")]
     use proptest::{num::u64::ANY, prelude::*};
@@ -209,18 +210,15 @@ mod tests {
             FieldElement::ZERO
         );
         assert_eq!(
-            FieldElement::from_bytes(
-                [
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 1
-                ]
-                .as_ref()
-            )
+            FieldElement::from_bytes(&Array([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1
+            ]))
             .unwrap(),
             FieldElement::ONE
         );
         assert!(bool::from(
-            FieldElement::from_bytes([0xff; 32].as_ref()).is_none()
+            FieldElement::from_bytes(&Array([0xff; 32])).is_none()
         ));
     }
 

p256/src/arithmetic/field.rs

@@ -3,20 +3,21 @@
 use criterion::{
     BenchmarkGroup, Criterion, criterion_group, criterion_main, measurement::Measurement,
 };
+use elliptic_curve::array::Array;
 use hex_literal::hex;
 use p521::FieldElement;
 use std::hint::black_box;
 
 fn test_field_element_x() -> FieldElement {
     black_box(FieldElement::from_bytes(
-        hex!("01a7596d38aac7868327ddc1ef5e8178cf052b7ebc512828e8a45955d85bef49494d15278198bbcc5454358c12a2af9a3874e7002e1a2f02fcb36ff3e3b4bc0c69e7").as_ref()
+        &Array(hex!("01a7596d38aac7868327ddc1ef5e8178cf052b7ebc512828e8a45955d85bef49494d15278198bbcc5454358c12a2af9a3874e7002e1a2f02fcb36ff3e3b4bc0c69e7"))
     )
     .unwrap())
 }
 
 fn test_field_element_y() -> FieldElement {
     black_box(FieldElement::from_bytes(
-        hex!("0184902e515982bb225b8c84f245e61b327c08e94d41c07d0b4101a963e02fe52f6a9f33e8b1de2394e0cb74c40790b4e489b5500e6804cabed0fe8c192443d4027b").as_ref()
+        &Array(hex!("0184902e515982bb225b8c84f245e61b327c08e94d41c07d0b4101a963e02fe52f6a9f33e8b1de2394e0cb74c40790b4e489b5500e6804cabed0fe8c192443d4027b"))
     )
     .unwrap())
 }