Skip to content

der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Feb 1, 2022
Merged

der: add SequenceRef type #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion der/src/asn1.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
octet_string::OctetString,
optional::OptionalRef,
printable_string::PrintableString,
sequence::Sequence,
sequence::{Sequence, SequenceRef},
sequence_of::{SequenceOf, SequenceOfIter},
set_of::{SetOf, SetOfIter},
utc_time::UtcTime,
Expand Down
49 changes: 48 additions & 1 deletion der/src/asn1/sequence.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
/// Body of the `SEQUENCE`.
body: ByteSlice<'a>,

/// Offset location in the outer document where this `SEQUENCE` begins.
offset: Length,
}

impl<'a> SequenceRef<'a> {
/// Decode the body of this sequence.
pub fn decode_body<F, T>(&self, f: F) -> Result<T>
where
F: FnOnce(&mut Decoder<'a>) -> Result<T>,
{
let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
let result = f(&mut nested_decoder)?;
nested_decoder.finish(result)
}
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
let offset = decoder.position();
let body = ByteSlice::decode_value(decoder, length)?;
Ok(Self { body, offset })
}
}

impl EncodeValue for SequenceRef<'_> {
fn value_len(&self) -> Result<Length> {
Ok(self.body.len())
}

fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
self.body.encode_value(encoder)
}
}

impl<'a> FixedTag for SequenceRef<'a> {
const TAG: Tag = Tag::Sequence;
}
58 changes: 21 additions & 37 deletions der/src/decoder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

/// Position within the decoded slice.
position: Length,

/// Offset where `bytes` occurs in the original ASN.1 DER document.
///
/// Used for nested decoding.
offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
Ok(Self {
bytes: Some(ByteSlice::new(bytes)?),
position: Length::ZERO,
offset: Length::ZERO,
})
}

/// Create a new decoder where `bytes` begins at a specified offset within
/// an original ASN.1 DER document.
///
/// This is used for calculating positions when decoding nested documents.
pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
Self {
bytes: Some(bytes),
position: Length::ZERO,
offset,
}
}

/// Decode a value which impls the [`Decodable`] trait.
pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

/// Get the position within the buffer.
pub fn position(&self) -> Length {
self.position
// TODO(tarcieri): avoid potential panic here

@tarcieritarcieriFeb 1, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.

(self.position + self.offset).expect("overflow")
}

/// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
where
F: FnOnce(&mut Decoder<'a>) -> Result<T>,
{
Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
let len = Length::decode(self)?;
self.decode_nested(len, f)
SequenceRef::decode(self)?.decode_body(f)
}

/// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
self.remaining()?.len().try_into()
}

/// Create a nested decoder which operates over the provided [`Length`].
///
/// The nested decoder is passed to the provided callback function which is
/// expected to decode a value of type `T` with it.
fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
where
F: FnOnce(&mut Self) -> Result<T>,
{
let start_pos = self.position();
let end_pos = (start_pos + length)?;
let bytes = match self.bytes {
Some(slice) => {
slice
.as_bytes()
.get(..end_pos.try_into()?)
.ok_or(ErrorKind::Incomplete {
expected_len: end_pos,
actual_len: self.input_len()?,
})?
}
None => return Err(self.error(ErrorKind::Failed)),
};

let mut nested_decoder = Self {
bytes: Some(ByteSlice::new(bytes)?),
position: start_pos,
};

self.position = end_pos;
let result = f(&mut nested_decoder)?;
nested_decoder.finish(result)
}

/// Obtain the remaining bytes in this decoder from the current cursor
/// position.
fn remaining(&self) -> Result<&'a [u8]> {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
der: add `SequenceRef` type by tarcieri · Pull Request #374 · RustCrypto/formats · GitHub
Skip to content
der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Feb 1, 2022
 Merged


der: add SequenceRef type
#374
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
der/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
 octet_string::OctetString,
 optional::OptionalRef,
 printable_string::PrintableString,
 sequence::Sequence,
 sequence::{Sequence, SequenceRef},
 sequence_of::{SequenceOf, SequenceOfIter},
 set_of::{SetOf, SetOfIter},
 utc_time::UtcTime,
Expand Down

49 changes: 48 additions & 1 deletion
der/src/asn1/sequence.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
 ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
 Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
 const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
 /// Body of the `SEQUENCE`.
 body: ByteSlice<'a>,

 /// Offset location in the outer document where this `SEQUENCE` begins.
 offset: Length,
}

impl<'a> SequenceRef<'a> {
 /// Decode the body of this sequence.
 pub fn decode_body<F, T>(&self, f: F) -> Result<T>
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
 fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
 let offset = decoder.position();
 let body = ByteSlice::decode_value(decoder, length)?;
 Ok(Self { body, offset })
 }
}

impl EncodeValue for SequenceRef<'_> {
 fn value_len(&self) -> Result<Length> {
 Ok(self.body.len())
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 self.body.encode_value(encoder)
 }
}

impl<'a> FixedTag for SequenceRef<'a> {
 const TAG: Tag = Tag::Sequence;
}

58 changes: 21 additions & 37 deletions
der/src/decoder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

 /// Position within the decoded slice.
 position: Length,

 /// Offset where `bytes` occurs in the original ASN.1 DER document.
 ///
 /// Used for nested decoding.
 offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
 Ok(Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: Length::ZERO,
 offset: Length::ZERO,
 })
 }

 /// Create a new decoder where `bytes` begins at a specified offset within
 /// an original ASN.1 DER document.
 ///
 /// This is used for calculating positions when decoding nested documents.
 pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
 Self {
 bytes: Some(bytes),
 position: Length::ZERO,
 offset,
 }
 }

 /// Decode a value which impls the [`Decodable`] trait.
 pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
 if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

 /// Get the position within the buffer.
 pub fn position(&self) -> Length {
 self.position
 // TODO(tarcieri): avoid potential panic here
@tarcieritarcieriFeb 1, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.
 (self.position + self.offset).expect("overflow")
 }

 /// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
 let len = Length::decode(self)?;
 self.decode_nested(len, f)
 SequenceRef::decode(self)?.decode_body(f)
 }

 /// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
 self.remaining()?.len().try_into()
 }

 /// Create a nested decoder which operates over the provided [`Length`].
 ///
 /// The nested decoder is passed to the provided callback function which is
 /// expected to decode a value of type `T` with it.
 fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
 where
 F: FnOnce(&mut Self) -> Result<T>,
 {
 let start_pos = self.position();
 let end_pos = (start_pos + length)?;
 let bytes = match self.bytes {
 Some(slice) => {
 slice
 .as_bytes()
 .get(..end_pos.try_into()?)
 .ok_or(ErrorKind::Incomplete {
 expected_len: end_pos,
 actual_len: self.input_len()?,
 })?
 }
 None => return Err(self.error(ErrorKind::Failed)),
 };

 let mut nested_decoder = Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: start_pos,
 };

 self.position = end_pos;
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }

 /// Obtain the remaining bytes in this decoder from the current cursor
 /// position.
 fn remaining(&self) -> Result<&'a [u8]> {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
der: add `SequenceRef` type by tarcieri · Pull Request #374 · RustCrypto/formats · GitHub
Skip to content
der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Feb 1, 2022
 Merged


der: add SequenceRef type
#374
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
der/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
 octet_string::OctetString,
 optional::OptionalRef,
 printable_string::PrintableString,
 sequence::Sequence,
 sequence::{Sequence, SequenceRef},
 sequence_of::{SequenceOf, SequenceOfIter},
 set_of::{SetOf, SetOfIter},
 utc_time::UtcTime,
Expand Down

49 changes: 48 additions & 1 deletion
der/src/asn1/sequence.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
 ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
 Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
 const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
 /// Body of the `SEQUENCE`.
 body: ByteSlice<'a>,

 /// Offset location in the outer document where this `SEQUENCE` begins.
 offset: Length,
}

impl<'a> SequenceRef<'a> {
 /// Decode the body of this sequence.
 pub fn decode_body<F, T>(&self, f: F) -> Result<T>
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
 fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
 let offset = decoder.position();
 let body = ByteSlice::decode_value(decoder, length)?;
 Ok(Self { body, offset })
 }
}

impl EncodeValue for SequenceRef<'_> {
 fn value_len(&self) -> Result<Length> {
 Ok(self.body.len())
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 self.body.encode_value(encoder)
 }
}

impl<'a> FixedTag for SequenceRef<'a> {
 const TAG: Tag = Tag::Sequence;
}

58 changes: 21 additions & 37 deletions
der/src/decoder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

 /// Position within the decoded slice.
 position: Length,

 /// Offset where `bytes` occurs in the original ASN.1 DER document.
 ///
 /// Used for nested decoding.
 offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
 Ok(Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: Length::ZERO,
 offset: Length::ZERO,
 })
 }

 /// Create a new decoder where `bytes` begins at a specified offset within
 /// an original ASN.1 DER document.
 ///
 /// This is used for calculating positions when decoding nested documents.
 pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
 Self {
 bytes: Some(bytes),
 position: Length::ZERO,
 offset,
 }
 }

 /// Decode a value which impls the [`Decodable`] trait.
 pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
 if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

 /// Get the position within the buffer.
 pub fn position(&self) -> Length {
 self.position
 // TODO(tarcieri): avoid potential panic here
@tarcieritarcieriFeb 1, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.
 (self.position + self.offset).expect("overflow")
 }

 /// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
 let len = Length::decode(self)?;
 self.decode_nested(len, f)
 SequenceRef::decode(self)?.decode_body(f)
 }

 /// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
 self.remaining()?.len().try_into()
 }

 /// Create a nested decoder which operates over the provided [`Length`].
 ///
 /// The nested decoder is passed to the provided callback function which is
 /// expected to decode a value of type `T` with it.
 fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
 where
 F: FnOnce(&mut Self) -> Result<T>,
 {
 let start_pos = self.position();
 let end_pos = (start_pos + length)?;
 let bytes = match self.bytes {
 Some(slice) => {
 slice
 .as_bytes()
 .get(..end_pos.try_into()?)
 .ok_or(ErrorKind::Incomplete {
 expected_len: end_pos,
 actual_len: self.input_len()?,
 })?
 }
 None => return Err(self.error(ErrorKind::Failed)),
 };

 let mut nested_decoder = Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: start_pos,
 };

 self.position = end_pos;
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }

 /// Obtain the remaining bytes in this decoder from the current cursor
 /// position.
 fn remaining(&self) -> Result<&'a [u8]> {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
der: add `SequenceRef` type by tarcieri · Pull Request #374 · RustCrypto/formats · GitHub
Skip to content
der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Feb 1, 2022
 Merged


der: add SequenceRef type
#374
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
der/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
 octet_string::OctetString,
 optional::OptionalRef,
 printable_string::PrintableString,
 sequence::Sequence,
 sequence::{Sequence, SequenceRef},
 sequence_of::{SequenceOf, SequenceOfIter},
 set_of::{SetOf, SetOfIter},
 utc_time::UtcTime,
Expand Down

49 changes: 48 additions & 1 deletion
der/src/asn1/sequence.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
 ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
 Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
 const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
 /// Body of the `SEQUENCE`.
 body: ByteSlice<'a>,

 /// Offset location in the outer document where this `SEQUENCE` begins.
 offset: Length,
}

impl<'a> SequenceRef<'a> {
 /// Decode the body of this sequence.
 pub fn decode_body<F, T>(&self, f: F) -> Result<T>
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
 fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
 let offset = decoder.position();
 let body = ByteSlice::decode_value(decoder, length)?;
 Ok(Self { body, offset })
 }
}

impl EncodeValue for SequenceRef<'_> {
 fn value_len(&self) -> Result<Length> {
 Ok(self.body.len())
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 self.body.encode_value(encoder)
 }
}

impl<'a> FixedTag for SequenceRef<'a> {
 const TAG: Tag = Tag::Sequence;
}

58 changes: 21 additions & 37 deletions
der/src/decoder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

 /// Position within the decoded slice.
 position: Length,

 /// Offset where `bytes` occurs in the original ASN.1 DER document.
 ///
 /// Used for nested decoding.
 offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
 Ok(Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: Length::ZERO,
 offset: Length::ZERO,
 })
 }

 /// Create a new decoder where `bytes` begins at a specified offset within
 /// an original ASN.1 DER document.
 ///
 /// This is used for calculating positions when decoding nested documents.
 pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
 Self {
 bytes: Some(bytes),
 position: Length::ZERO,
 offset,
 }
 }

 /// Decode a value which impls the [`Decodable`] trait.
 pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
 if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

 /// Get the position within the buffer.
 pub fn position(&self) -> Length {
 self.position
 // TODO(tarcieri): avoid potential panic here
@tarcieritarcieriFeb 1, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.
 (self.position + self.offset).expect("overflow")
 }

 /// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
 let len = Length::decode(self)?;
 self.decode_nested(len, f)
 SequenceRef::decode(self)?.decode_body(f)
 }

 /// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
 self.remaining()?.len().try_into()
 }

 /// Create a nested decoder which operates over the provided [`Length`].
 ///
 /// The nested decoder is passed to the provided callback function which is
 /// expected to decode a value of type `T` with it.
 fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
 where
 F: FnOnce(&mut Self) -> Result<T>,
 {
 let start_pos = self.position();
 let end_pos = (start_pos + length)?;
 let bytes = match self.bytes {
 Some(slice) => {
 slice
 .as_bytes()
 .get(..end_pos.try_into()?)
 .ok_or(ErrorKind::Incomplete {
 expected_len: end_pos,
 actual_len: self.input_len()?,
 })?
 }
 None => return Err(self.error(ErrorKind::Failed)),
 };

 let mut nested_decoder = Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: start_pos,
 };

 self.position = end_pos;
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }

 /// Obtain the remaining bytes in this decoder from the current cursor
 /// position.
 fn remaining(&self) -> Result<&'a [u8]> {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
der: add `SequenceRef` type by tarcieri · Pull Request #374 · RustCrypto/formats · GitHub
Skip to content
der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Feb 1, 2022
 Merged


der: add SequenceRef type
#374
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
der/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
 octet_string::OctetString,
 optional::OptionalRef,
 printable_string::PrintableString,
 sequence::Sequence,
 sequence::{Sequence, SequenceRef},
 sequence_of::{SequenceOf, SequenceOfIter},
 set_of::{SetOf, SetOfIter},
 utc_time::UtcTime,
Expand Down

49 changes: 48 additions & 1 deletion
der/src/asn1/sequence.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
 ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
 Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
 const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
 /// Body of the `SEQUENCE`.
 body: ByteSlice<'a>,

 /// Offset location in the outer document where this `SEQUENCE` begins.
 offset: Length,
}

impl<'a> SequenceRef<'a> {
 /// Decode the body of this sequence.
 pub fn decode_body<F, T>(&self, f: F) -> Result<T>
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
 fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
 let offset = decoder.position();
 let body = ByteSlice::decode_value(decoder, length)?;
 Ok(Self { body, offset })
 }
}

impl EncodeValue for SequenceRef<'_> {
 fn value_len(&self) -> Result<Length> {
 Ok(self.body.len())
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 self.body.encode_value(encoder)
 }
}

impl<'a> FixedTag for SequenceRef<'a> {
 const TAG: Tag = Tag::Sequence;
}

58 changes: 21 additions & 37 deletions
der/src/decoder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

 /// Position within the decoded slice.
 position: Length,

 /// Offset where `bytes` occurs in the original ASN.1 DER document.
 ///
 /// Used for nested decoding.
 offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
 Ok(Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: Length::ZERO,
 offset: Length::ZERO,
 })
 }

 /// Create a new decoder where `bytes` begins at a specified offset within
 /// an original ASN.1 DER document.
 ///
 /// This is used for calculating positions when decoding nested documents.
 pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
 Self {
 bytes: Some(bytes),
 position: Length::ZERO,
 offset,
 }
 }

 /// Decode a value which impls the [`Decodable`] trait.
 pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
 if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

 /// Get the position within the buffer.
 pub fn position(&self) -> Length {
 self.position
 // TODO(tarcieri): avoid potential panic here
@tarcieritarcieriFeb 1, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.
 (self.position + self.offset).expect("overflow")
 }

 /// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
 let len = Length::decode(self)?;
 self.decode_nested(len, f)
 SequenceRef::decode(self)?.decode_body(f)
 }

 /// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
 self.remaining()?.len().try_into()
 }

 /// Create a nested decoder which operates over the provided [`Length`].
 ///
 /// The nested decoder is passed to the provided callback function which is
 /// expected to decode a value of type `T` with it.
 fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
 where
 F: FnOnce(&mut Self) -> Result<T>,
 {
 let start_pos = self.position();
 let end_pos = (start_pos + length)?;
 let bytes = match self.bytes {
 Some(slice) => {
 slice
 .as_bytes()
 .get(..end_pos.try_into()?)
 .ok_or(ErrorKind::Incomplete {
 expected_len: end_pos,
 actual_len: self.input_len()?,
 })?
 }
 None => return Err(self.error(ErrorKind::Failed)),
 };

 let mut nested_decoder = Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: start_pos,
 };

 self.position = end_pos;
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }

 /// Obtain the remaining bytes in this decoder from the current cursor
 /// position.
 fn remaining(&self) -> Result<&'a [u8]> {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
der: add `SequenceRef` type by tarcieri · Pull Request #374 · RustCrypto/formats · GitHub
Skip to content
der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Feb 1, 2022
 Merged


der: add SequenceRef type
#374
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
der/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
 octet_string::OctetString,
 optional::OptionalRef,
 printable_string::PrintableString,
 sequence::Sequence,
 sequence::{Sequence, SequenceRef},
 sequence_of::{SequenceOf, SequenceOfIter},
 set_of::{SetOf, SetOfIter},
 utc_time::UtcTime,
Expand Down

49 changes: 48 additions & 1 deletion
der/src/asn1/sequence.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
 ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
 Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
 const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
 /// Body of the `SEQUENCE`.
 body: ByteSlice<'a>,

 /// Offset location in the outer document where this `SEQUENCE` begins.
 offset: Length,
}

impl<'a> SequenceRef<'a> {
 /// Decode the body of this sequence.
 pub fn decode_body<F, T>(&self, f: F) -> Result<T>
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
 fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
 let offset = decoder.position();
 let body = ByteSlice::decode_value(decoder, length)?;
 Ok(Self { body, offset })
 }
}

impl EncodeValue for SequenceRef<'_> {
 fn value_len(&self) -> Result<Length> {
 Ok(self.body.len())
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 self.body.encode_value(encoder)
 }
}

impl<'a> FixedTag for SequenceRef<'a> {
 const TAG: Tag = Tag::Sequence;
}

58 changes: 21 additions & 37 deletions
der/src/decoder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

 /// Position within the decoded slice.
 position: Length,

 /// Offset where `bytes` occurs in the original ASN.1 DER document.
 ///
 /// Used for nested decoding.
 offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
 Ok(Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: Length::ZERO,
 offset: Length::ZERO,
 })
 }

 /// Create a new decoder where `bytes` begins at a specified offset within
 /// an original ASN.1 DER document.
 ///
 /// This is used for calculating positions when decoding nested documents.
 pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
 Self {
 bytes: Some(bytes),
 position: Length::ZERO,
 offset,
 }
 }

 /// Decode a value which impls the [`Decodable`] trait.
 pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
 if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

 /// Get the position within the buffer.
 pub fn position(&self) -> Length {
 self.position
 // TODO(tarcieri): avoid potential panic here
@tarcieritarcieriFeb 1, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.
 (self.position + self.offset).expect("overflow")
 }

 /// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
 let len = Length::decode(self)?;
 self.decode_nested(len, f)
 SequenceRef::decode(self)?.decode_body(f)
 }

 /// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
 self.remaining()?.len().try_into()
 }

 /// Create a nested decoder which operates over the provided [`Length`].
 ///
 /// The nested decoder is passed to the provided callback function which is
 /// expected to decode a value of type `T` with it.
 fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
 where
 F: FnOnce(&mut Self) -> Result<T>,
 {
 let start_pos = self.position();
 let end_pos = (start_pos + length)?;
 let bytes = match self.bytes {
 Some(slice) => {
 slice
 .as_bytes()
 .get(..end_pos.try_into()?)
 .ok_or(ErrorKind::Incomplete {
 expected_len: end_pos,
 actual_len: self.input_len()?,
 })?
 }
 None => return Err(self.error(ErrorKind::Failed)),
 };

 let mut nested_decoder = Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: start_pos,
 };

 self.position = end_pos;
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }

 /// Obtain the remaining bytes in this decoder from the current cursor
 /// position.
 fn remaining(&self) -> Result<&'a [u8]> {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
der: add `SequenceRef` type by tarcieri · Pull Request #374 · RustCrypto/formats · GitHub
Skip to content
der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Feb 1, 2022
 Merged


der: add SequenceRef type
#374
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
der/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
 octet_string::OctetString,
 optional::OptionalRef,
 printable_string::PrintableString,
 sequence::Sequence,
 sequence::{Sequence, SequenceRef},
 sequence_of::{SequenceOf, SequenceOfIter},
 set_of::{SetOf, SetOfIter},
 utc_time::UtcTime,
Expand Down

49 changes: 48 additions & 1 deletion
der/src/asn1/sequence.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
 ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
 Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
 const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
 /// Body of the `SEQUENCE`.
 body: ByteSlice<'a>,

 /// Offset location in the outer document where this `SEQUENCE` begins.
 offset: Length,
}

impl<'a> SequenceRef<'a> {
 /// Decode the body of this sequence.
 pub fn decode_body<F, T>(&self, f: F) -> Result<T>
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
 fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
 let offset = decoder.position();
 let body = ByteSlice::decode_value(decoder, length)?;
 Ok(Self { body, offset })
 }
}

impl EncodeValue for SequenceRef<'_> {
 fn value_len(&self) -> Result<Length> {
 Ok(self.body.len())
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 self.body.encode_value(encoder)
 }
}

impl<'a> FixedTag for SequenceRef<'a> {
 const TAG: Tag = Tag::Sequence;
}

58 changes: 21 additions & 37 deletions
der/src/decoder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

 /// Position within the decoded slice.
 position: Length,

 /// Offset where `bytes` occurs in the original ASN.1 DER document.
 ///
 /// Used for nested decoding.
 offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
 Ok(Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: Length::ZERO,
 offset: Length::ZERO,
 })
 }

 /// Create a new decoder where `bytes` begins at a specified offset within
 /// an original ASN.1 DER document.
 ///
 /// This is used for calculating positions when decoding nested documents.
 pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
 Self {
 bytes: Some(bytes),
 position: Length::ZERO,
 offset,
 }
 }

 /// Decode a value which impls the [`Decodable`] trait.
 pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
 if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

 /// Get the position within the buffer.
 pub fn position(&self) -> Length {
 self.position
 // TODO(tarcieri): avoid potential panic here
@tarcieritarcieriFeb 1, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.
 (self.position + self.offset).expect("overflow")
 }

 /// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
 let len = Length::decode(self)?;
 self.decode_nested(len, f)
 SequenceRef::decode(self)?.decode_body(f)
 }

 /// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
 self.remaining()?.len().try_into()
 }

 /// Create a nested decoder which operates over the provided [`Length`].
 ///
 /// The nested decoder is passed to the provided callback function which is
 /// expected to decode a value of type `T` with it.
 fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
 where
 F: FnOnce(&mut Self) -> Result<T>,
 {
 let start_pos = self.position();
 let end_pos = (start_pos + length)?;
 let bytes = match self.bytes {
 Some(slice) => {
 slice
 .as_bytes()
 .get(..end_pos.try_into()?)
 .ok_or(ErrorKind::Incomplete {
 expected_len: end_pos,
 actual_len: self.input_len()?,
 })?
 }
 None => return Err(self.error(ErrorKind::Failed)),
 };

 let mut nested_decoder = Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: start_pos,
 };

 self.position = end_pos;
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }

 /// Obtain the remaining bytes in this decoder from the current cursor
 /// position.
 fn remaining(&self) -> Result<&'a [u8]> {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
der: add `SequenceRef` type by tarcieri · Pull Request #374 · RustCrypto/formats · GitHub
Skip to content
der: add SequenceRef type#374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Feb 1, 2022
 Merged


der: add SequenceRef type
#374
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
der/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ pub use self::{
 octet_string::OctetString,
 optional::OptionalRef,
 printable_string::PrintableString,
 sequence::Sequence,
 sequence::{Sequence, SequenceRef},
 sequence_of::{SequenceOf, SequenceOfIter},
 set_of::{SetOf, SetOfIter},
 utc_time::UtcTime,
Expand Down

49 changes: 48 additions & 1 deletion
der/src/asn1/sequence.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
//! The [`Sequence`] trait simplifies writing decoders/encoders which map ASN.1
//! `SEQUENCE`s to Rust structs.

use crate::{Decodable, Encodable, EncodeValue, Encoder, FixedTag, Length, Result, Tag};
use crate::{
 ByteSlice, Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Length,
 Result, Tag,
};

/// ASN.1 `SEQUENCE` trait.
///
Expand DownExpand Up@@ -48,3 +51,47 @@ where
{
 const TAG: Tag = Tag::Sequence;
}

/// The [`SequenceRef`] type provides raw access to the octets which comprise a
/// DER-encoded `SEQUENCE`.
pub struct SequenceRef<'a> {
 /// Body of the `SEQUENCE`.
 body: ByteSlice<'a>,

 /// Offset location in the outer document where this `SEQUENCE` begins.
 offset: Length,
}

impl<'a> SequenceRef<'a> {
 /// Decode the body of this sequence.
 pub fn decode_body<F, T>(&self, f: F) -> Result<T>
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 let mut nested_decoder = Decoder::new_with_offset(self.body, self.offset);
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }
}

impl<'a> DecodeValue<'a> for SequenceRef<'a> {
 fn decode_value(decoder: &mut Decoder<'a>, length: Length) -> Result<Self> {
 let offset = decoder.position();
 let body = ByteSlice::decode_value(decoder, length)?;
 Ok(Self { body, offset })
 }
}

impl EncodeValue for SequenceRef<'_> {
 fn value_len(&self) -> Result<Length> {
 Ok(self.body.len())
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 self.body.encode_value(encoder)
 }
}

impl<'a> FixedTag for SequenceRef<'a> {
 const TAG: Tag = Tag::Sequence;
}

58 changes: 21 additions & 37 deletions
der/src/decoder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,11 @@ pub struct Decoder<'a> {

 /// Position within the decoded slice.
 position: Length,

 /// Offset where `bytes` occurs in the original ASN.1 DER document.
 ///
 /// Used for nested decoding.
 offset: Length,
}

impl<'a> Decoder<'a> {
Expand All@@ -24,9 +29,22 @@ impl<'a> Decoder<'a> {
 Ok(Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: Length::ZERO,
 offset: Length::ZERO,
 })
 }

 /// Create a new decoder where `bytes` begins at a specified offset within
 /// an original ASN.1 DER document.
 ///
 /// This is used for calculating positions when decoding nested documents.
 pub(crate) fn new_with_offset(bytes: ByteSlice<'a>, offset: Length) -> Self {
 Self {
 bytes: Some(bytes),
 position: Length::ZERO,
 offset,
 }
 }

 /// Decode a value which impls the [`Decodable`] trait.
 pub fn decode<T: Decodable<'a>>(&mut self) -> Result<T> {
 if self.is_failed() {
Expand DownExpand Up@@ -58,7 +76,8 @@ impl<'a> Decoder<'a> {

 /// Get the position within the buffer.
 pub fn position(&self) -> Length {
 self.position
 // TODO(tarcieri): avoid potential panic here
@tarcieritarcieriFeb 1, 2022

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can probably be addressed by incrementing both position and offset when data is read. This was a quick workaround to get everything initially working.
 (self.position + self.offset).expect("overflow")
 }

 /// Peek at the next byte in the decoder without modifying the cursor.
Expand DownExpand Up@@ -231,9 +250,7 @@ impl<'a> Decoder<'a> {
 where
 F: FnOnce(&mut Decoder<'a>) -> Result<T>,
 {
 Tag::try_from(self.byte()?)?.assert_eq(Tag::Sequence)?;
 let len = Length::decode(self)?;
 self.decode_nested(len, f)
 SequenceRef::decode(self)?.decode_body(f)
 }

 /// Decode a single byte, updating the internal cursor.
Expand DownExpand Up@@ -295,39 +312,6 @@ impl<'a> Decoder<'a> {
 self.remaining()?.len().try_into()
 }

 /// Create a nested decoder which operates over the provided [`Length`].
 ///
 /// The nested decoder is passed to the provided callback function which is
 /// expected to decode a value of type `T` with it.
 fn decode_nested<F, T>(&mut self, length: Length, f: F) -> Result<T>
 where
 F: FnOnce(&mut Self) -> Result<T>,
 {
 let start_pos = self.position();
 let end_pos = (start_pos + length)?;
 let bytes = match self.bytes {
 Some(slice) => {
 slice
 .as_bytes()
 .get(..end_pos.try_into()?)
 .ok_or(ErrorKind::Incomplete {
 expected_len: end_pos,
 actual_len: self.input_len()?,
 })?
 }
 None => return Err(self.error(ErrorKind::Failed)),
 };

 let mut nested_decoder = Self {
 bytes: Some(ByteSlice::new(bytes)?),
 position: start_pos,
 };

 self.position = end_pos;
 let result = f(&mut nested_decoder)?;
 nested_decoder.finish(result)
 }

 /// Obtain the remaining bytes in this decoder from the current cursor
 /// position.
 fn remaining(&self) -> Result<&'a [u8]> {
Expand Down