Skip to content

Commit 4e9e34a

Browse files
authored
build(deps): bump der from 0.8.0-rc.7 to 0.8.0-rc.8 (#1363)
1 parent 8fd8af2 commit 4e9e34a

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ opt-level = 2
2222

2323
[patch.crates-io]
2424
ecdsa = { git = "https://github.com/RustCrypto/signatures.git" }
25-
elliptic-curve = { git = "https://github.com/RustCrypto/traits.git" }
2625

2726
hash2curve = { path = "hash2curve" }
2827
primefield = { path = "primefield" }

bign256/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ elliptic-curve = { version = "0.14.0-rc.11", features = ["sec1"] }
2222

2323
# optional dependencies
2424
belt-hash = { version = "0.2.0-rc.0", optional = true, default-features = false }
25-
der = { version = "0.8.0-rc.0" }
25+
der = { version = "0.8.0-rc.8" }
2626
digest = { version = "0.11.0-rc.0", optional = true }
2727
hex-literal = { version = "1", optional = true }
2828
hkdf = { version = "0.13.0-rc.0", optional = true }

bp256/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rust-version = "1.85"
1717
elliptic-curve = { version = "0.14.0-rc.11", default-features = false, features = ["sec1"] }
1818

1919
# optional dependencies
20-
ecdsa = { version = "0.17.0-rc.4", optional = true, default-features = false, features = ["der"] }
20+
ecdsa = { version = "0.17.0-rc.5", optional = true, default-features = false, features = ["der"] }
2121
primefield = { version = "=0.14.0-pre.4", optional = true }
2222
primeorder = { version = "=0.14.0-pre.7", optional = true }
2323
sha2 = { version = "0.11.0-rc.0", optional = true, default-features = false }

bp384/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rust-version = "1.85"
1717
elliptic-curve = { version = "0.14.0-rc.11", default-features = false, features = ["sec1"] }
1818

1919
# optional dependencies
20-
ecdsa = { version = "0.17.0-rc.4", optional = true, default-features = false, features = ["der"] }
20+
ecdsa = { version = "0.17.0-rc.5", optional = true, default-features = false, features = ["der"] }
2121
primefield = { version = "=0.14.0-pre.4", optional = true }
2222
primeorder = { version = "=0.14.0-pre.7", optional = true }
2323
sha2 = { version = "0.11.0-rc.0", optional = true, default-features = false }

sm2/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rfc6979 = { version = "0.5.0-rc.0", optional = true }
2828
serdect = { version = "0.3", optional = true, default-features = false }
2929
signature = { version = "3.0.0-rc.1", optional = true, features = ["rand_core"] }
3030
sm3 = { version = "0.5.0-rc.0", optional = true, default-features = false }
31-
der = { version = "0.8.0-rc.7", optional = true }
31+
der = { version = "0.8.0-rc.8", optional = true }
3232

3333
[dev-dependencies]
3434
hex-literal = "1"

sm2/src/dsa/der.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ impl<'a> Decode<'a> for Signature {
159159

160160
fn decode<R: Reader<'a>>(reader: &mut R) -> der::Result<Self> {
161161
let header = Header::peek(reader)?;
162-
header.tag.assert_eq(Tag::Sequence)?;
162+
header.tag().assert_eq(Tag::Sequence)?;
163163

164164
let mut buf = SignatureBytes::default();
165-
let len = (header.encoded_len()? + header.length)?;
165+
let len = (header.encoded_len()? + header.length())?;
166166
let slice = buf
167167
.get_mut(..usize::try_from(len)?)
168168
.ok_or_else(|| reader.error(Tag::Sequence.length_error()))?;

sm2/src/pke.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl<'a> DecodeValue<'a> for Cipher<'a> {
114114
decoder: &mut R,
115115
header: der::Header,
116116
) -> core::result::Result<Self, Self::Error> {
117-
decoder.read_nested(header.length, |nr| {
117+
decoder.read_nested(header.length(), |nr| {
118118
let x = UintRef::decode(nr)?.as_bytes();
119119
let y = UintRef::decode(nr)?.as_bytes();
120120
let digest = OctetStringRef::decode(nr)?.into();

0 commit comments

Comments
 (0)