Project import generated by Copybara. am: 2c936697b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/beto-rust/+/23261592
Change-Id: I5a7b77dfc8914c0148df661e5cc44604825aa41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/connections/ukey2/ukey2/src/ukey2_handshake.rs b/nearby/connections/ukey2/ukey2/src/ukey2_handshake.rs
index ec88318..9e81fb8 100644
--- a/nearby/connections/ukey2/ukey2/src/ukey2_handshake.rs
+++ b/nearby/connections/ukey2/ukey2/src/ukey2_handshake.rs
@@ -419,7 +419,7 @@
p256_secret.public_key_bytes(),
HandshakeCipher::P256Sha512,
)
- .unwrap(),
+ .expect("Output of p256_secret.public_key_bytes should always be valid input for encode_public_key"),
),
..Default::default()
};
diff --git a/nearby/connections/ukey2/ukey2_connections/fuzz/Cargo.lock b/nearby/connections/ukey2/ukey2_connections/fuzz/Cargo.lock
index 8320405..8f42dbe 100644
--- a/nearby/connections/ukey2/ukey2_connections/fuzz/Cargo.lock
+++ b/nearby/connections/ukey2/ukey2_connections/fuzz/Cargo.lock
@@ -71,9 +71,9 @@
[[package]]
name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "bitflags"
@@ -156,9 +156,9 @@
[[package]]
name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
dependencies = [
"generic-array",
"rand_core",
@@ -180,6 +180,9 @@
[[package]]
name = "crypto_provider"
version = "0.1.0"
+dependencies = [
+ "bytes",
+]
[[package]]
name = "crypto_provider_rustcrypto"
@@ -230,11 +233,12 @@
[[package]]
name = "der"
-version = "0.6.1"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0"
dependencies = [
"const-oid",
+ "zeroize",
]
[[package]]
@@ -299,13 +303,12 @@
[[package]]
name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d"
dependencies = [
"base16ct",
"crypto-bigint",
- "der",
"digest",
"ff",
"generic-array",
@@ -349,9 +352,9 @@
[[package]]
name = "ff"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"subtle",
@@ -371,6 +374,7 @@
dependencies = [
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -386,9 +390,9 @@
[[package]]
name = "group"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"rand_core",
@@ -578,9 +582,9 @@
[[package]]
name = "p256"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55"
+checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47"
dependencies = [
"elliptic-curve",
"primeorder",
@@ -622,9 +626,9 @@
[[package]]
name = "primeorder"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2"
+checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0"
dependencies = [
"elliptic-curve",
]
@@ -770,9 +774,9 @@
[[package]]
name = "sec1"
-version = "0.3.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
dependencies = [
"base16ct",
"der",
diff --git a/nearby/crypto/crypto_provider/src/p256.rs b/nearby/crypto/crypto_provider/src/p256.rs
index be14a39..ac589f8 100644
--- a/nearby/crypto/crypto_provider/src/p256.rs
+++ b/nearby/crypto/crypto_provider/src/p256.rs
@@ -194,6 +194,17 @@
);
}
+ /// Test for P256PublicKey::from_sec1_bytes
+ pub fn from_sec1_bytes_at_infinity_test<E: EcdhProviderForP256Test>(_: PhantomData<E>) {
+ // A single [0] byte represents a point at infinity.
+ let sec1 = hex!("00");
+ let result = E::PublicKey::from_sec1_bytes(&sec1);
+ assert!(
+ result.is_err(),
+ "Creating public key from point at infinity should fail"
+ );
+ }
+
/// Test for P256PublicKey::to_affine_coordinates
pub fn public_key_to_affine_coordinates_test<E: EcdhProviderForP256Test>(_: PhantomData<E>) {
// https://www.secg.org/sec1-v2.pdf, section 2.3.3
@@ -209,6 +220,52 @@
assert_eq!(actual_y, expected_y);
}
+ /// Test for P256PublicKey::to_affine_coordinates with compressed point with 0x02 octet prefix.
+ /// Support for compressed points is optional according to the specs, but both openssl and
+ /// rustcrypto implementations support it.
+ pub fn public_key_to_affine_coordinates_compressed02_test<E: EcdhProviderForP256Test>(
+ _: PhantomData<E>,
+ ) {
+ // https://www.secg.org/sec1-v2.pdf, section 2.3.3
+ let expected_x = hex!("21238e877c2400f15f9ea7d4353ac0a63dcb5d13168a96fcfc93bdc66031ed1c");
+ let expected_y = hex!("fa339bd0886602e91b9d2aa9b43213f660b680b1c97ef09cb1cacdc14e9d85ee");
+ let sec1 = hex!("0221238e877c2400f15f9ea7d4353ac0a63dcb5d13168a96fcfc93bdc66031ed1c");
+ let public_key = E::PublicKey::from_sec1_bytes(&sec1).unwrap();
+ let (actual_x, actual_y) = public_key.to_affine_coordinates().unwrap();
+ assert_eq!(actual_x, expected_x);
+ assert_eq!(actual_y, expected_y);
+ }
+
+ /// Test for P256PublicKey::to_affine_coordinates with compressed point with 0x03 octet prefix
+ /// Support for compressed points is optional according to the specs, but both openssl and
+ /// rustcrypto implementations support it.
+ pub fn public_key_to_affine_coordinates_compressed03_test<E: EcdhProviderForP256Test>(
+ _: PhantomData<E>,
+ ) {
+ // https://www.secg.org/sec1-v2.pdf, section 2.3.3
+ let expected_x = hex!("f557ef33d52e540e6aa4e6fcbb62a314adcb051cc8a1fefc69d004c282af81ff");
+ let expected_y = hex!("96cd4c6ed5cbf00bb3184e5cd983c3442160310c8519b4c4d16292be83eec539");
+ let sec1 = hex!("03f557ef33d52e540e6aa4e6fcbb62a314adcb051cc8a1fefc69d004c282af81ff");
+ let public_key = E::PublicKey::from_sec1_bytes(&sec1).unwrap();
+ let (actual_x, actual_y) = public_key.to_affine_coordinates().unwrap();
+ assert_eq!(actual_x, expected_x);
+ assert_eq!(actual_y, expected_y);
+ }
+
+ /// Test for P256PublicKey::to_affine_coordinates with the top byte being zero
+ pub fn public_key_to_affine_coordinates_zero_top_byte_test<E: EcdhProviderForP256Test>(
+ _: PhantomData<E>,
+ ) {
+ // https://www.secg.org/sec1-v2.pdf, section 2.3.3
+ let expected_x = hex!("00f24fe76679c57bc6c2f025af92e6c0b2058fb15fa41014775987587400ed48");
+ let expected_y = hex!("e09f6fa9979a60f578a62dca805ad75b9e6b89403f2ebb934869e3697ac590e9");
+ let sec1 = hex!("0400f24fe76679c57bc6c2f025af92e6c0b2058fb15fa41014775987587400ed48e09f6fa9979a60f578a62dca805ad75b9e6b89403f2ebb934869e3697ac590e9");
+ let public_key = E::PublicKey::from_sec1_bytes(&sec1).unwrap();
+ let (actual_x, actual_y) = public_key.to_affine_coordinates().unwrap();
+ assert_eq!(actual_x, expected_x);
+ assert_eq!(actual_y, expected_y);
+ }
+
/// Test for P256 Diffie-Hellman key exchange.
pub fn p256_ecdh_test<E: EcdhProviderForP256Test>(_: PhantomData<E>) {
// From wycheproof ecdh_secp256r1_ecpoint_test.json, tcId 1
@@ -300,9 +357,19 @@
#[case::to_bytes(to_bytes_test)]
#[case::to_bytes_random(to_bytes_random_test)]
#[case::from_sec1_bytes_not_on_curve(from_sec1_bytes_not_on_curve_test)]
+ #[case::from_sec1_bytes_not_on_infinity(from_sec1_bytes_at_infinity_test)]
#[case::from_affine_coordinates(from_affine_coordinates_test)]
#[case::from_affine_coordinates_not_on_curve(from_affine_coordinates_not_on_curve_test)]
#[case::public_key_to_affine_coordinates(public_key_to_affine_coordinates_test)]
+ #[case::public_key_to_affine_coordinates_compressed02(
+ public_key_to_affine_coordinates_compressed02_test
+ )]
+ #[case::public_key_to_affine_coordinates_compressed03(
+ public_key_to_affine_coordinates_compressed03_test
+ )]
+ #[case::public_key_to_affine_coordinates_zero_top_byte(
+ public_key_to_affine_coordinates_zero_top_byte_test
+ )]
#[case::p256_ecdh(p256_ecdh_test)]
#[case::wycheproof_p256(wycheproof_p256_test)]
fn p256_test_cases<C: CryptoProvider>(#[case] testcase: CryptoProviderTestCase<C>) {}
diff --git a/nearby/crypto/crypto_provider_openssl/src/p256.rs b/nearby/crypto/crypto_provider_openssl/src/p256.rs
index a0c5072..35581dd 100644
--- a/nearby/crypto/crypto_provider_openssl/src/p256.rs
+++ b/nearby/crypto/crypto_provider_openssl/src/p256.rs
@@ -38,6 +38,8 @@
OpenSslError(ErrorStack),
/// Unexpected size for the given input.
WrongSize,
+ /// Invalid input given when creating keys from their byte representations.
+ InvalidInput,
}
impl From<ErrorStack> for Error {
@@ -51,6 +53,10 @@
type Error = Error;
fn from_sec1_bytes(bytes: &[u8]) -> Result<Self, Self::Error> {
+ if bytes == [0] {
+ // Single 0 byte means infinity point.
+ return Err(Error::InvalidInput);
+ }
let ecgroup = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1)?;
let mut bncontext = BigNumContext::new()?;
let ecpoint = EcPoint::from_bytes(&ecgroup, bytes, &mut bncontext)?;
@@ -87,8 +93,16 @@
.public_key()
.affine_coordinates_gfp(&ecgroup, &mut p256x, &mut p256y, &mut bnctx)?;
Ok((
- p256x.to_vec().try_into().map_err(|_| Error::WrongSize)?,
- p256y.to_vec().try_into().map_err(|_| Error::WrongSize)?,
+ p256x
+ .to_vec_padded(32)
+ .map_err(|_| Error::WrongSize)?
+ .try_into()
+ .expect("to_vec_padded(32) should always return vec of length 32"),
+ p256y
+ .to_vec_padded(32)
+ .map_err(|_| Error::WrongSize)?
+ .try_into()
+ .expect("to_vec_padded(32) should always return vec of length 32"),
))
}
}
diff --git a/nearby/deny.toml b/nearby/deny.toml
index 344e226..c289733 100644
--- a/nearby/deny.toml
+++ b/nearby/deny.toml
@@ -82,7 +82,9 @@
"Apache-2.0 WITH LLVM-exception",
"BSD-3-Clause",
"BSD-2-Clause",
+ "ISC",
"Unicode-DFS-2016",
+ "OpenSSL",
"Unlicense"
]
# List of explicitly disallowed licenses
diff --git a/nearby/presence/ldt/fuzz/Cargo.lock b/nearby/presence/ldt/fuzz/Cargo.lock
index a007fe8..2f38bca 100644
--- a/nearby/presence/ldt/fuzz/Cargo.lock
+++ b/nearby/presence/ldt/fuzz/Cargo.lock
@@ -54,9 +54,9 @@
[[package]]
name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "block-buffer"
@@ -133,9 +133,9 @@
[[package]]
name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
dependencies = [
"generic-array",
"rand_core",
@@ -157,6 +157,9 @@
[[package]]
name = "crypto_provider"
version = "0.1.0"
+dependencies = [
+ "bytes",
+]
[[package]]
name = "crypto_provider_rustcrypto"
@@ -207,11 +210,12 @@
[[package]]
name = "der"
-version = "0.6.1"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0"
dependencies = [
"const-oid",
+ "zeroize",
]
[[package]]
@@ -259,13 +263,12 @@
[[package]]
name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d"
dependencies = [
"base16ct",
"crypto-bigint",
- "der",
"digest",
"ff",
"generic-array",
@@ -279,9 +282,9 @@
[[package]]
name = "ff"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"subtle",
@@ -301,6 +304,7 @@
dependencies = [
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -316,9 +320,9 @@
[[package]]
name = "group"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"rand_core",
@@ -425,9 +429,9 @@
[[package]]
name = "p256"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55"
+checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47"
dependencies = [
"elliptic-curve",
"primeorder",
@@ -469,9 +473,9 @@
[[package]]
name = "primeorder"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2"
+checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0"
dependencies = [
"elliptic-curve",
]
@@ -524,9 +528,9 @@
[[package]]
name = "sec1"
-version = "0.3.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
dependencies = [
"base16ct",
"der",
diff --git a/nearby/presence/ldt_np_adv/fuzz/Cargo.lock b/nearby/presence/ldt_np_adv/fuzz/Cargo.lock
index 3bfc3fd..4922fc2 100644
--- a/nearby/presence/ldt_np_adv/fuzz/Cargo.lock
+++ b/nearby/presence/ldt_np_adv/fuzz/Cargo.lock
@@ -58,9 +58,9 @@
[[package]]
name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "block-buffer"
@@ -137,9 +137,9 @@
[[package]]
name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
dependencies = [
"generic-array",
"rand_core",
@@ -161,6 +161,9 @@
[[package]]
name = "crypto_provider"
version = "0.1.0"
+dependencies = [
+ "bytes",
+]
[[package]]
name = "crypto_provider_rustcrypto"
@@ -211,11 +214,12 @@
[[package]]
name = "der"
-version = "0.6.1"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0"
dependencies = [
"const-oid",
+ "zeroize",
]
[[package]]
@@ -263,13 +267,12 @@
[[package]]
name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d"
dependencies = [
"base16ct",
"crypto-bigint",
- "der",
"digest",
"ff",
"generic-array",
@@ -283,9 +286,9 @@
[[package]]
name = "ff"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"subtle",
@@ -305,6 +308,7 @@
dependencies = [
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -320,9 +324,9 @@
[[package]]
name = "group"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"rand_core",
@@ -452,9 +456,9 @@
[[package]]
name = "p256"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55"
+checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47"
dependencies = [
"elliptic-curve",
"primeorder",
@@ -496,9 +500,9 @@
[[package]]
name = "primeorder"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2"
+checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0"
dependencies = [
"elliptic-curve",
]
@@ -551,9 +555,9 @@
[[package]]
name = "sec1"
-version = "0.3.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
dependencies = [
"base16ct",
"der",
diff --git a/nearby/presence/ldt_np_adv_ffi/Cargo.lock b/nearby/presence/ldt_np_adv_ffi/Cargo.lock
index 3a16c56..075e658 100644
--- a/nearby/presence/ldt_np_adv_ffi/Cargo.lock
+++ b/nearby/presence/ldt_np_adv_ffi/Cargo.lock
@@ -67,9 +67,9 @@
[[package]]
name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "base64ct"
@@ -166,9 +166,9 @@
[[package]]
name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
dependencies = [
"generic-array",
"rand_core",
@@ -267,15 +267,6 @@
[[package]]
name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
-]
-
-[[package]]
-name = "der"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0"
@@ -321,13 +312,12 @@
[[package]]
name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d"
dependencies = [
"base16ct",
"crypto-bigint",
- "der 0.6.1",
"digest",
"ff",
"generic-array",
@@ -341,9 +331,9 @@
[[package]]
name = "ff"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"subtle",
@@ -378,6 +368,7 @@
dependencies = [
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -393,9 +384,9 @@
[[package]]
name = "group"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"rand_core",
@@ -597,9 +588,9 @@
[[package]]
name = "p256"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55"
+checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47"
dependencies = [
"elliptic-curve",
"primeorder",
@@ -627,7 +618,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49"
dependencies = [
- "der 0.7.1",
+ "der",
"spki",
]
@@ -663,9 +654,9 @@
[[package]]
name = "primeorder"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2"
+checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0"
dependencies = [
"elliptic-curve",
]
@@ -750,12 +741,12 @@
[[package]]
name = "sec1"
-version = "0.3.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
dependencies = [
"base16ct",
- "der 0.6.1",
+ "der",
"generic-array",
"subtle",
"zeroize",
@@ -806,7 +797,7 @@
checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f"
dependencies = [
"base64ct",
- "der 0.7.1",
+ "der",
]
[[package]]
diff --git a/nearby/presence/xts_aes/fuzz/Cargo.lock b/nearby/presence/xts_aes/fuzz/Cargo.lock
index 5408688..2bdaef3 100644
--- a/nearby/presence/xts_aes/fuzz/Cargo.lock
+++ b/nearby/presence/xts_aes/fuzz/Cargo.lock
@@ -54,9 +54,9 @@
[[package]]
name = "base16ct"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "block-buffer"
@@ -133,9 +133,9 @@
[[package]]
name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
dependencies = [
"generic-array",
"rand_core",
@@ -207,11 +207,12 @@
[[package]]
name = "der"
-version = "0.6.1"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0"
dependencies = [
"const-oid",
+ "zeroize",
]
[[package]]
@@ -259,13 +260,12 @@
[[package]]
name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d"
dependencies = [
"base16ct",
"crypto-bigint",
- "der",
"digest",
"ff",
"generic-array",
@@ -279,9 +279,9 @@
[[package]]
name = "ff"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
dependencies = [
"rand_core",
"subtle",
@@ -301,6 +301,7 @@
dependencies = [
"typenum",
"version_check",
+ "zeroize",
]
[[package]]
@@ -316,9 +317,9 @@
[[package]]
name = "group"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
dependencies = [
"ff",
"rand_core",
@@ -406,9 +407,9 @@
[[package]]
name = "p256"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c124b3cbce43bcbac68c58ec181d98ed6cc7e6d0aa7c3ba97b2563410b0e55"
+checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47"
dependencies = [
"elliptic-curve",
"primeorder",
@@ -450,9 +451,9 @@
[[package]]
name = "primeorder"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b54f7131b3dba65a2f414cf5bd25b66d4682e4608610668eae785750ba4c5b2"
+checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0"
dependencies = [
"elliptic-curve",
]
@@ -505,9 +506,9 @@
[[package]]
name = "sec1"
-version = "0.3.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
dependencies = [
"base16ct",
"der",
