Skip to content

der: use strict context-specific skipping condition (equal tag numbers only) - #1740

Merged
tarcieri merged 2 commits into
RustCrypto:masterfrom
dishmaker:dishmaker/peek_decode_optional
May 4, 2025
Merged

der: use strict context-specific skipping condition (equal tag numbers only)#1740
tarcieri merged 2 commits into
RustCrypto:masterfrom
dishmaker:dishmaker/peek_decode_optional

Conversation

@dishmaker

@dishmakerdishmaker commented Mar 25, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes#1723

I simplified fn decode_with into peek_tag_matches.

Depends on:

@dishmaker
dishmaker marked this pull request as draft March 25, 2025 11:03
@dishmaker
dishmakerforce-pushed the dishmaker/peek_decode_optional branch from 21d4c6a to 5239f9eCompareApril 21, 2025 16:56
@dishmakerdishmaker changed the title der: strict skipping condition in decode_with/peek_decode_optionalder: strict skipping condition in decode_with/peek_tag_matchesApr 21, 2025
@dishmaker

dishmaker commented Apr 21, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Edit: solved

Looks like I broke something in pkcs8

 Running tests/builder.rs (target/debug/deps/builder-c42694f58bf84285)
running 9 tests
test dynamic_signer ... ok
test certificate_request_attributes ... ok
test certificate_request ... ok
test async_builder ... ok
test leaf_certificate has been running for over 60 seconds
test pss_certificate has been running for over 60 seconds
test root_ca_certificate has been running for over 60 seconds
test root_ca_certificate_ecdsa has been running for over 60 seconds
test sub_ca_certificate has been running for over 60 seconds

@dishmaker

dishmaker commented Apr 21, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Edit: Master branch gets stuck too on cargo test --all --all-features

[Spoiler] htop

image

@dishmaker
dishmaker marked this pull request as ready for review April 21, 2025 17:45
dishmaker
dishmaker commented Apr 22, 2025
View reviewed changes
Comment threadpkcs8/src/private_key_info.rs
@tarcieri

tarcieri commented Apr 22, 2025

Copy link
Copy Markdown
Member

What was causing the infinite loop? That seems bad

@dishmaker

dishmaker commented Apr 22, 2025

Copy link
Copy Markdown
ContributorAuthor

zlint - htop screenshot above

@dishmakerdishmaker changed the title der: strict skipping condition in decode_with/peek_tag_matchesder: use strict context-specific skipping condition (equal tag numbers only)Apr 22, 2025
@dishmakerdishmaker mentioned this pull request Apr 22, 2025
Closed
@tarcieri

tarcieri commented Apr 29, 2025

Copy link
Copy Markdown
Member

@dishmaker can you rebase?

@dishmaker
der: rename decode_with -> peek_tag_matches
8290fc5
der: replace tag skip condition to `tag.number() != tag_number`
der: add class param to peek_decode_optional
der: peek_tag_matches bool
der: docs IsConstructed
@dishmaker
dishmakerforce-pushed the dishmaker/peek_decode_optional branch from 751ce25 to 8290fc5CompareApril 30, 2025 13:46
@dishmaker

dishmaker commented May 2, 2025

Copy link
Copy Markdown
ContributorAuthor

When this merges, I can add Private<T> and Application<T> as-is.

Similar to 1f43a08#diff-360e6ab129e770a109e6cf7f57b6340d480bb2fd17a7f75952ef65aab6a442eb

@tarcieri
tarcieri merged commit cb96284 into RustCrypto:masterMay 4, 2025
@tarcieritarcieri mentioned this pull request Feb 13, 2026
Merged
tarcieri added a commit that referenced this pull request Feb 13, 2026
@tarcieri
der v0.8.0 (#2234)
7784544
## Added
- Custom error types support to the `Decode` and `DecodeValue` traits (#1055)
- `EncodingRules` enum (#1321)
- `Decode::from_ber` (#1389)
- Documentation for field-level `tag_mode` attribute (#1401)
- `Hash` implementation for `AlgorithmIdentifier` (#1414)
- `SequenceRef::as_bytes` and `AsRef<[u8]>` impl (#1454)
- `Reader::peek_into` (#1478)
- `GeneralString` variant to `Tag` (#1512)
- Conversions from `OctetString(Ref)` to `Vec`/`Bytes` (#1540)
- Custom error types in derive macros (#1560)
- Support for tags beyond 30 (#1651)
- Const `::new` to `Length`, `BytesRef`, and `AnyRef` (#1713)
- Const `GeneralizedTime::from_date_time` (#1718)
- `Decode::from_der_partial` (#1725)
- Conversions between `BitStringRef`/`OctetStringRef` and `[u8; N]` (#1731)
- Add class bits consts for Application and Private tag support (#1721)
- conversions between `heapless:Vec<u8>` and `OctetStringRef` (#1735)
- `IsConstructed` trait, impl'ed on any `FixedTag` (#1744)
- Implement `Hash` for `SetOf` (#1764)
- Implement `Uint`/`Int` conversions from native types (#1762)
- Support for `APPLICATION`, `CONTEXT-SPECIFIC` and `PRIVATE` tags (#1819, #1825, #1944)
- Support `Cow<[u8]>` in `derive(Sequence)` (#1850)
- `diagnostic::on_unimplemented` attributes (#1876)
- `Reader::read_value`, auto-nest `DecodeValue` (#1877, #1895, #1897, #1901)
- Indefinite length support for BER (#1884, #1885, #1894, #1900, #1902, #1910)
- Constructed OctetString support (#1899, #1922)
- string conversions, predicate methods for EncodingRules (#1903, #1953)
- `Any::header` (#1935)
- `Tag::RelativeOid` (#1942)
- `ber` feature (#1948, #1950)
- Hash derive for `StringOwned` and `Ia5String` (#1973)
- Implement `DecodeValue/EncodeValue/Tagged` for `Cow` (#2093)
- Add doc examples for `EncodeValue`, `Encode`, `DecodeValue`, `Decode`, `Error`, `ErrorKind`, `Tagged`, `FixedTag`,
`IsConstructed`, `Tag`, `Length`, `Header` (#2075, #2071, #2070, #2064, #2058, #2052, #2053, #2051)
- `SequenceRef::new` (#2224)
## Changed
- Return `Tag::Integer.length_error()` on empty ints (#1400)
- Allow all blanket impls on `?Sized` types (#1451)
- Refactor `Tag::peek` (#1479)
- Refactor `Header::peek` (#1480)
- Use `core::error::Error` (#1553)
- Use 2024 edition, bump MSRV to 1.85 (#1670)
- Bump `const-oid` to v0.10 (#1676)
- Reject zero lengths reads (#1716)
- Deprecate `TagNumber::new` (#1727)
- Use strict context-specific skipping condition (equal tag numbers only) (#1740)
- Const `Any::to_ref`, `BytesOwned::to_ref` (#1797)
- Return `ErrorKind::Noncanonical` in `EXPLICIT` when primitive (#1818)
- Use `read_nested` to check length of `IMPLICIT` types (#1739)
- Simplify `From<&UintRef<'a>>` for `Uint` (#1840)
- Make `ObjectIdentifier<MAX_SIZE>` impls generic (#1851)
- Extract `reader::position::Position` (#1880)
- Make `Reader` cloneable (#1883)
- Simplify `Header::peek` and `Tag::peek` (#1886)
- Improve constructed bit handling (#1919)
- Use fat pointer in `OctetStringRef`, consolidate bytes/string modules, improve internal ref types
(#1920, #1921, #1998, #2040)
- Change constructor `Header::new`, add `Header::with_length`, tests for constructed octet string (#1931, #1930)
- Simplify `der_cmp` for `Length` (#1997)
- Rename variable encoder -> writer and improve example (#2078)
- Have `PemReader` decode to `Cow::Owned` (#2094)
- Only sort `SET OF` types with `EncodingRules::Der` (#2219)
- `SetOf` and `SequenceOf` now require `heapless` feature (#2220, #2229)
## Fixed
- Append in `Encode::encode_to_vec` (#1760)
- Derive optional OCTET/BIT STRING on `Option<&[u8]>` (#1737)
- X.680 tag order: compare class and number first (#1790)
- BMPString compatibility in derive macros (#1793)
- `Tag::peek_optional` for 6-byte and 7+ byte tags (#1804)
- `Header::peek` for 11-byte tag-lengths (#1828)
- Panic in `value_cmp`: add `Iterator::size_hint` (#1830)
- Error position tracking improvements (#1889, #2080, #2079)
- Bound `Decode(Value)::Error` on `core::error::Error` (#2137)
- Have `SetOf(Vec)::insert` check for duplicates (#2217)
## Removed
- `TagNumber::N0..N30` consts (#1724)
- 256MiB limit on `Length` (#1726)
- Generic `<T>` from `Reader::finish` (#1833)
- Deprecated `SetOf(Vec)::add` methods (#2232)
- `SequenceRef` lifetime (#2224)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tarcieritarcieritarcieri approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

der: Correct context-specific skipping algorithm

2 participants

@dishmaker@tarcieri