Skip to content

Commit d54b576

Browse files
committed
Merge remote-tracking branch 'benma/deps'
2 parents f8679ee + 6110f05 commit d54b576

File tree

252 files changed

+15635
-69847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+15635
-69847
lines changed

src/rust/Cargo.lock

Lines changed: 18 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ lazy_static = { version = "1.4.0" }
3232
num-bigint = { version = "0.4.3", default-features = false }
3333
sha2 = { version = "0.10.8", default-features = false }
3434
sha3 = { version = "0.10.8", default-features = false }
35-
zeroize = "1.6.0"
35+
zeroize = "1.7.0"
3636

3737
[profile.release]
3838
# This only affects the .elf output. Debug info is stripped from the final .bin.

src/rust/bitbox02-rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ num-traits = { version = "0.2", default-features = false, optional = true }
4242
bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.2", optional = true }
4343
bech32 = { version = "0.10.0-beta", default-features = false, optional = true }
4444
blake2 = { version = "0.10.6", default-features = false, optional = true }
45-
minicbor = { version = "0.20.0", default-features = false, features = ["alloc"], optional = true }
45+
minicbor = { version = "0.24.0", default-features = false, features = ["alloc"], optional = true }
4646
crc = { version = "3.0.1", optional = true }
4747
ed25519-dalek = { version = "2.0.0", default-features = false, features = ["hazmat"], optional = true }
4848
lazy_static = { workspace = true, optional = true }

src/rust/bitbox02-rust/src/hww/api/cardano/address.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn decode_byron_payment_address(params: &params::Params, address: &str) -> Resul
7777
if decoder.array().or(Err(()))?.ok_or(())? != 2 {
7878
return Err(());
7979
}
80-
if decoder.tag().or(Err(()))? != minicbor::data::Tag::Cbor {
80+
if decoder.tag().or(Err(()))? != minicbor::data::IanaTag::Cbor.tag() {
8181
return Err(());
8282
}
8383
let payload = decoder.bytes().or(Err(()))?;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{"CONTRIBUTING.md":"8de12002f36c177f129fd187be0b5f09d4db581d6876f15067cfa4dab1bf9ee3","Cargo.toml":"e0eb6a5c546b48766cb48b64a84613ed7e0ad2a1b736e3a47eb01b514289915c","LICENSE.md":"79860758b46e85f70a1762c21a8fff4f2d220d89f9bdca096e12aed15b9951c5","README.md":"55f3cc434b08bc4cc624594cb9e1ea4a35d7a6dd59f8890cfc1deef068a72052","src/attrs.rs":"0fc43f4a13109dc5ffe2045ca481dab7ecd76bcf7bb5da065e1e9c5c50ac1ff1","src/attrs/codec.rs":"d8c92c191be48ffd2044bc019862e19298acb561571cb2fbfefeabeb73181c6d","src/attrs/encoding.rs":"7bbe4a52fd6b04fc07d52106fd536b25709682b1dfe5f0bb4345148ce683ef97","src/attrs/idx.rs":"f34564ada165726d934e96c3d71fbb1e161723efecc30c3db8ab0e705dc047ff","src/attrs/typeparam.rs":"949d25c14100905d537d02f9b81882953b9bf21b70e724b9d86cb7fa71d549ac","src/cbor_len.rs":"71d78d542b1f59e94ef932869c19e7d334166e7f88c14db5ffbb4f05e6b8036d","src/decode.rs":"c379a06fc59f16614fbf6630ba96184c8dad24c658125b993b78434b5c7f54ad","src/encode.rs":"3447eb6bebc43af2b0399fe0ca1c9e607f1020e299c1bb25e1f75e5b483594f6","src/fields.rs":"45c077b10b25164a08610a6585a65192e877ab740146380f45b7bc7a55ba41f9","src/lib.rs":"89f9241c9761428d96ee99c316f4488c0b770d797b205a2b34be1b95f52b6e62","src/lifetimes.rs":"57a40c3834ada3473416edc8c9f608a6d24c5be0a2f1dbbd463d9f5b7d655fad","src/variants.rs":"1e4542a82c60e9ba1d651f5ef0133ffd13d7265f11c2b4126d0cf7b06cc1c58f"},"package":"1154809406efdb7982841adb6311b3d095b46f78342dd646736122fe6b19e267"}
1+
{"files":{"CONTRIBUTING.md":"8de12002f36c177f129fd187be0b5f09d4db581d6876f15067cfa4dab1bf9ee3","Cargo.toml":"edb928b420a3f17daa466115d25f21904aad324d599c785f8b26b042302d5a78","LICENSE.md":"79860758b46e85f70a1762c21a8fff4f2d220d89f9bdca096e12aed15b9951c5","README.md":"55f3cc434b08bc4cc624594cb9e1ea4a35d7a6dd59f8890cfc1deef068a72052","src/attrs.rs":"31827d420570116407f1ab406fe85ad9a295da577527e471a8b221d6278e97c1","src/attrs/codec.rs":"d8c92c191be48ffd2044bc019862e19298acb561571cb2fbfefeabeb73181c6d","src/attrs/encoding.rs":"74ee9506eb4e1162ade22ab8fd089b4e019320fe99bd2c23189058bc1621661f","src/attrs/idx.rs":"25354a01220882dc63c9cb46b6a5c153defade94e43d63e565cda892043f9fed","src/attrs/typeparam.rs":"949d25c14100905d537d02f9b81882953b9bf21b70e724b9d86cb7fa71d549ac","src/cbor_len.rs":"54406cb1a04af4e899cad394d89a9318accc4ffc0ced1bce7eb163c2f2ce6cc6","src/decode.rs":"ab67e4169095a94a4cd0350a5a433a8371b24b6a19d325436de6a3dbb075cf6e","src/encode.rs":"b2b10843e456512ed026529ae8de116a2d1d93c99bc70d73e7e090bd019da571","src/fields.rs":"d36d9439c2bc66a3b7cd57b326378dbf0d23912a2d3214dd25b663800f090aeb","src/lib.rs":"8aedf01773dc1613522d0d8407c7783148b0f3261408f1765f846d4af2a2aec4","src/lifetimes.rs":"67ddb2ba1df5cf224e4059d96230df922b180f78d4ce36cd9de578e9f5d7044d","src/variants.rs":"fd4cfec37638b51892d9f0a452013de74b65aafbd5401016dbe3183a4045daf5"},"package":"a6bdc119b1a405df86a8cde673295114179dbd0ebe18877c26ba89fb080365c2"}

src/rust/vendor/minicbor-derive/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[package]
1313
edition = "2021"
1414
name = "minicbor-derive"
15-
version = "0.13.0"
15+
version = "0.15.0"
1616
authors = ["Toralf Wittner <[email protected]>"]
1717
description = "Derive minicbor `Decode` and `Encode` traits."
1818
documentation = "https://twittner.gitlab.io/minicbor/minicbor_derive/"
@@ -27,19 +27,18 @@ keywords = [
2727
categories = ["encoding"]
2828
license = "BlueOak-1.0.0"
2929
repository = "https://gitlab.com/twittner/minicbor"
30-
resolver = "1"
3130

3231
[lib]
3332
proc-macro = true
3433

3534
[dependencies.proc-macro2]
36-
version = "1.0.18"
35+
version = "1.0.79"
3736

3837
[dependencies.quote]
39-
version = "1.0.7"
38+
version = "1.0.35"
4039

4140
[dependencies.syn]
42-
version = "1.0.72"
41+
version = "2.0.58"
4342
features = [
4443
"derive",
4544
"extra-traits",
@@ -50,4 +49,4 @@ features = [
5049

5150
[features]
5251
alloc = []
53-
std = []
52+
std = ["alloc"]

0 commit comments

Comments
 (0)