Skip to content

Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into from
Feb 11, 2022
Merged

Use FlagSet to provide an ergonomic experience with flag types #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65d6dd5
der: add support for FlagSet types
npmccallum Feb 9, 2022
8551e0d
x509: port flag types to use FlagSet
npmccallum Feb 10, 2022
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
8 changes: 8 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions der/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down
68 changes: 68 additions & 0 deletions der/src/asn1/bit_string.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
T: flagset::Flags,
T::Type: From<bool>,
T::Type: core::ops::Shl<usize, Output = T::Type>,
{
fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
let position = decoder.position();

let bits = BitString::decode_value(decoder, header)?;

let mut flags = T::none().bits();
if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
return Err(Error::new(ErrorKind::Overlength, position));
}

for (i, bit) in bits.bits().enumerate() {
flags |= T::Type::from(bit) << i;
}

Ok(Self::new_truncated(flags))
}
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
T: flagset::Flags,
u128: From<T::Type>,
{
let bits: u128 = set.bits().into();
let mut swap = 0u128;

for i in 0..128 {
let on = bits & (1 << i);
swap |= on >> i << (128 - i - 1);
}

(bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
T::Type: From<bool>,
T::Type: core::ops::Shl<usize, Output = T::Type>,
u128: From<T::Type>,
{
fn value_len(&self) -> Result<Length> {
let (lead, buff) = encode(self);
let buff = &buff[..buff.len() - lead / 8];
BitString::new((lead % 8) as u8, buff)?.value_len()
}

fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
let (lead, buff) = encode(self);
let buff = &buff[..buff.len() - lead / 8];
BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
}
}

#[cfg(test)]
mod tests {
use super::{BitString, Result, Tag};
Expand Down
3 changes: 2 additions & 1 deletion x509/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down
148 changes: 0 additions & 148 deletions x509/src/extensions_utils.rs
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions x509/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading
, '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" + '
Use FlagSet to provide an ergonomic experience with flag types by npmccallum · Pull Request #412 · RustCrypto/formats · GitHub
Skip to content
Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into

from

Feb 11, 2022
 Merged


Use FlagSet to provide an ergonomic experience with flag types
#412
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
65d6dd5

der: add support for FlagSet types


npmccallum Feb 9, 2022
8551e0d

x509: port flag types to use FlagSet


npmccallum Feb 10, 2022

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


8 changes: 8 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
der/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down

68 changes: 68 additions & 0 deletions
der/src/asn1/bit_string.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
 const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
 T: flagset::Flags,
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
{
 fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
 let position = decoder.position();

 let bits = BitString::decode_value(decoder, header)?;

 let mut flags = T::none().bits();
 if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
 return Err(Error::new(ErrorKind::Overlength, position));
 }

 for (i, bit) in bits.bits().enumerate() {
 flags |= T::Type::from(bit) << i;
 }

 Ok(Self::new_truncated(flags))
 }
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
 T: flagset::Flags,
 u128: From<T::Type>,
{
 let bits: u128 = set.bits().into();
 let mut swap = 0u128;

 for i in 0..128 {
 let on = bits & (1 << i);
 swap |= on >> i << (128 - i - 1);
 }

 (bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
 u128: From<T::Type>,
{
 fn value_len(&self) -> Result<Length> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.value_len()
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
 }
}

#[cfg(test)]
mod tests {
 use super::{BitString, Result, Tag};
Expand Down

3 changes: 2 additions & 1 deletion
x509/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down

148 changes: 0 additions & 148 deletions
x509/src/extensions_utils.rs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
x509/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
 certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading

, '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('^' + ".*" + '
Use FlagSet to provide an ergonomic experience with flag types by npmccallum · Pull Request #412 · RustCrypto/formats · GitHub
Skip to content
Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into

from

Feb 11, 2022
 Merged


Use FlagSet to provide an ergonomic experience with flag types
#412
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
65d6dd5

der: add support for FlagSet types


npmccallum Feb 9, 2022
8551e0d

x509: port flag types to use FlagSet


npmccallum Feb 10, 2022

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


8 changes: 8 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
der/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down

68 changes: 68 additions & 0 deletions
der/src/asn1/bit_string.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
 const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
 T: flagset::Flags,
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
{
 fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
 let position = decoder.position();

 let bits = BitString::decode_value(decoder, header)?;

 let mut flags = T::none().bits();
 if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
 return Err(Error::new(ErrorKind::Overlength, position));
 }

 for (i, bit) in bits.bits().enumerate() {
 flags |= T::Type::from(bit) << i;
 }

 Ok(Self::new_truncated(flags))
 }
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
 T: flagset::Flags,
 u128: From<T::Type>,
{
 let bits: u128 = set.bits().into();
 let mut swap = 0u128;

 for i in 0..128 {
 let on = bits & (1 << i);
 swap |= on >> i << (128 - i - 1);
 }

 (bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
 u128: From<T::Type>,
{
 fn value_len(&self) -> Result<Length> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.value_len()
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
 }
}

#[cfg(test)]
mod tests {
 use super::{BitString, Result, Tag};
Expand Down

3 changes: 2 additions & 1 deletion
x509/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down

148 changes: 0 additions & 148 deletions
x509/src/extensions_utils.rs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
x509/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
 certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading

, '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('^' + ".*" + '
Use FlagSet to provide an ergonomic experience with flag types by npmccallum · Pull Request #412 · RustCrypto/formats · GitHub
Skip to content
Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into

from

Feb 11, 2022
 Merged


Use FlagSet to provide an ergonomic experience with flag types
#412
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
65d6dd5

der: add support for FlagSet types


npmccallum Feb 9, 2022
8551e0d

x509: port flag types to use FlagSet


npmccallum Feb 10, 2022

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


8 changes: 8 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
der/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down

68 changes: 68 additions & 0 deletions
der/src/asn1/bit_string.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
 const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
 T: flagset::Flags,
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
{
 fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
 let position = decoder.position();

 let bits = BitString::decode_value(decoder, header)?;

 let mut flags = T::none().bits();
 if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
 return Err(Error::new(ErrorKind::Overlength, position));
 }

 for (i, bit) in bits.bits().enumerate() {
 flags |= T::Type::from(bit) << i;
 }

 Ok(Self::new_truncated(flags))
 }
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
 T: flagset::Flags,
 u128: From<T::Type>,
{
 let bits: u128 = set.bits().into();
 let mut swap = 0u128;

 for i in 0..128 {
 let on = bits & (1 << i);
 swap |= on >> i << (128 - i - 1);
 }

 (bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
 u128: From<T::Type>,
{
 fn value_len(&self) -> Result<Length> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.value_len()
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
 }
}

#[cfg(test)]
mod tests {
 use super::{BitString, Result, Tag};
Expand Down

3 changes: 2 additions & 1 deletion
x509/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down

148 changes: 0 additions & 148 deletions
x509/src/extensions_utils.rs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
x509/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
 certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading

, '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" + '
Use FlagSet to provide an ergonomic experience with flag types by npmccallum · Pull Request #412 · RustCrypto/formats · GitHub
Skip to content
Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into

from

Feb 11, 2022
 Merged


Use FlagSet to provide an ergonomic experience with flag types
#412
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
65d6dd5

der: add support for FlagSet types


npmccallum Feb 9, 2022
8551e0d

x509: port flag types to use FlagSet


npmccallum Feb 10, 2022

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


8 changes: 8 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
der/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down

68 changes: 68 additions & 0 deletions
der/src/asn1/bit_string.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
 const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
 T: flagset::Flags,
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
{
 fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
 let position = decoder.position();

 let bits = BitString::decode_value(decoder, header)?;

 let mut flags = T::none().bits();
 if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
 return Err(Error::new(ErrorKind::Overlength, position));
 }

 for (i, bit) in bits.bits().enumerate() {
 flags |= T::Type::from(bit) << i;
 }

 Ok(Self::new_truncated(flags))
 }
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
 T: flagset::Flags,
 u128: From<T::Type>,
{
 let bits: u128 = set.bits().into();
 let mut swap = 0u128;

 for i in 0..128 {
 let on = bits & (1 << i);
 swap |= on >> i << (128 - i - 1);
 }

 (bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
 u128: From<T::Type>,
{
 fn value_len(&self) -> Result<Length> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.value_len()
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
 }
}

#[cfg(test)]
mod tests {
 use super::{BitString, Result, Tag};
Expand Down

3 changes: 2 additions & 1 deletion
x509/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down

148 changes: 0 additions & 148 deletions
x509/src/extensions_utils.rs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
x509/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
 certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading

, '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('^' + ".*" + '
Use FlagSet to provide an ergonomic experience with flag types by npmccallum · Pull Request #412 · RustCrypto/formats · GitHub
Skip to content
Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into

from

Feb 11, 2022
 Merged


Use FlagSet to provide an ergonomic experience with flag types
#412
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
65d6dd5

der: add support for FlagSet types


npmccallum Feb 9, 2022
8551e0d

x509: port flag types to use FlagSet


npmccallum Feb 10, 2022

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


8 changes: 8 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
der/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down

68 changes: 68 additions & 0 deletions
der/src/asn1/bit_string.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
 const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
 T: flagset::Flags,
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
{
 fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
 let position = decoder.position();

 let bits = BitString::decode_value(decoder, header)?;

 let mut flags = T::none().bits();
 if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
 return Err(Error::new(ErrorKind::Overlength, position));
 }

 for (i, bit) in bits.bits().enumerate() {
 flags |= T::Type::from(bit) << i;
 }

 Ok(Self::new_truncated(flags))
 }
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
 T: flagset::Flags,
 u128: From<T::Type>,
{
 let bits: u128 = set.bits().into();
 let mut swap = 0u128;

 for i in 0..128 {
 let on = bits & (1 << i);
 swap |= on >> i << (128 - i - 1);
 }

 (bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
 u128: From<T::Type>,
{
 fn value_len(&self) -> Result<Length> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.value_len()
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
 }
}

#[cfg(test)]
mod tests {
 use super::{BitString, Result, Tag};
Expand Down

3 changes: 2 additions & 1 deletion
x509/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down

148 changes: 0 additions & 148 deletions
x509/src/extensions_utils.rs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
x509/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
 certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading

, '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('^' + ".*" + '
Use FlagSet to provide an ergonomic experience with flag types by npmccallum · Pull Request #412 · RustCrypto/formats · GitHub
Skip to content
Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into

from

Feb 11, 2022
 Merged


Use FlagSet to provide an ergonomic experience with flag types
#412
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
65d6dd5

der: add support for FlagSet types


npmccallum Feb 9, 2022
8551e0d

x509: port flag types to use FlagSet


npmccallum Feb 10, 2022

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


8 changes: 8 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
der/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down

68 changes: 68 additions & 0 deletions
der/src/asn1/bit_string.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
 const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
 T: flagset::Flags,
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
{
 fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
 let position = decoder.position();

 let bits = BitString::decode_value(decoder, header)?;

 let mut flags = T::none().bits();
 if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
 return Err(Error::new(ErrorKind::Overlength, position));
 }

 for (i, bit) in bits.bits().enumerate() {
 flags |= T::Type::from(bit) << i;
 }

 Ok(Self::new_truncated(flags))
 }
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
 T: flagset::Flags,
 u128: From<T::Type>,
{
 let bits: u128 = set.bits().into();
 let mut swap = 0u128;

 for i in 0..128 {
 let on = bits & (1 << i);
 swap |= on >> i << (128 - i - 1);
 }

 (bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
 u128: From<T::Type>,
{
 fn value_len(&self) -> Result<Length> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.value_len()
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
 }
}

#[cfg(test)]
mod tests {
 use super::{BitString, Result, Tag};
Expand Down

3 changes: 2 additions & 1 deletion
x509/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down

148 changes: 0 additions & 148 deletions
x509/src/extensions_utils.rs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
x509/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
 certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading

, '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); }
})();
})();
Use FlagSet to provide an ergonomic experience with flag types by npmccallum · Pull Request #412 · RustCrypto/formats · GitHub
Skip to content
Use FlagSet to provide an ergonomic experience with flag types#412

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 2 commits into

from

Feb 11, 2022
 Merged


Use FlagSet to provide an ergonomic experience with flag types
#412
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
65d6dd5

der: add support for FlagSet types


npmccallum Feb 9, 2022
8551e0d

x509: port flag types to use FlagSet


npmccallum Feb 10, 2022

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


8 changes: 8 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
der/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ rust-version = "1.57"
[dependencies]
const-oid = { version = "0.8", optional = true, path = "../const-oid" }
der_derive = { version = "=0.6.0-pre.1", optional = true, path = "derive" }
flagset = { version = "0.4.3", optional = true }
pem-rfc7468 = { version = "=0.4.0-pre.0", optional = true, path = "../pem-rfc7468" }
time = { version = "0.3", optional = true, default-features = false }

Expand Down

68 changes: 68 additions & 0 deletions
der/src/asn1/bit_string.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,6 +225,74 @@ impl<'a> ExactSizeIterator for BitStringIter<'a> {

impl<'a> FusedIterator for BitStringIter<'a> {}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> FixedTag for flagset::FlagSet<T> {
 const TAG: Tag = BitString::TAG;
}

#[cfg(feature = "flagset")]
impl<'a, T> DecodeValue<'a> for flagset::FlagSet<T>
where
 T: flagset::Flags,
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
{
 fn decode_value(decoder: &mut Decoder<'a>, header: Header) -> Result<Self> {
 let position = decoder.position();

 let bits = BitString::decode_value(decoder, header)?;

 let mut flags = T::none().bits();
 if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
 return Err(Error::new(ErrorKind::Overlength, position));
 }

 for (i, bit) in bits.bits().enumerate() {
 flags |= T::Type::from(bit) << i;
 }

 Ok(Self::new_truncated(flags))
 }
}

#[cfg(feature = "flagset")]
#[inline(always)]
fn encode<T>(set: &flagset::FlagSet<T>) -> (usize, [u8; 16])
where
 T: flagset::Flags,
 u128: From<T::Type>,
{
 let bits: u128 = set.bits().into();
 let mut swap = 0u128;

 for i in 0..128 {
 let on = bits & (1 << i);
 swap |= on >> i << (128 - i - 1);
 }

 (bits.leading_zeros() as usize, swap.to_be_bytes())
}

#[cfg(feature = "flagset")]
impl<T: flagset::Flags> EncodeValue for flagset::FlagSet<T>
where
 T::Type: From<bool>,
 T::Type: core::ops::Shl<usize, Output = T::Type>,
 u128: From<T::Type>,
{
 fn value_len(&self) -> Result<Length> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.value_len()
 }

 fn encode_value(&self, encoder: &mut Encoder<'_>) -> Result<()> {
 let (lead, buff) = encode(self);
 let buff = &buff[..buff.len() - lead / 8];
 BitString::new((lead % 8) as u8, buff)?.encode_value(encoder)
 }
}

#[cfg(test)]
mod tests {
 use super::{BitString, Result, Tag};
Expand Down

3 changes: 2 additions & 1 deletion
x509/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,8 @@ edition = "2021"
rust-version = "1.56"

[dependencies]
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc"], path = "../der" }
der = { version = "=0.6.0-pre.1", features = ["derive", "alloc", "flagset"], path = "../der" }
flagset = { version = "0.4.3" }
spki = { version = "=0.6.0-pre.0", path = "../spki" }
x501 = { version = "=0.1.0-pre.0", path = "../x501" }

Expand Down

148 changes: 0 additions & 148 deletions
x509/src/extensions_utils.rs

View file


Open in desktop


This file was deleted.


5 changes: 1 addition & 4 deletions
x509/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,11 @@ extern crate alloc;
extern crate std;

mod certificate;
pub mod extensions_utils;
mod general_name;
pub mod pkix_extensions;
pub mod pkix_oids;
pub mod trust_anchor_format;

pub use crate::{
 certificate::*, extensions_utils::*, general_name::*, pkix_extensions::*, pkix_oids::*,
};
pub use crate::{certificate::*, general_name::*, pkix_extensions::*, pkix_oids::*};
pub use der::{self, asn1::ObjectIdentifier};
pub use spki::{self, AlgorithmIdentifier, SubjectPublicKeyInfo};
Loading