Derived Version Structs#410

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

Derived Version Structs #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6ee1a4
der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)
npmccallum Feb 10, 2022
ea00dfc
Derive Integer for pkcs10::Version
npmccallum Feb 10, 2022
fdc0dd5
Add a Version enum to x509
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
34 changes: 27 additions & 7 deletions der/derive/src/enumerated.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
/// Value of the `repr` attribute.
repr: Ident,

/// Whether or not to tag the enum as an integer
integer: bool,

Comment on lines +22 to +24

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.

/// Variants of this enum.
variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

// Reject `asn1` attributes, parse the `repr` attribute
let mut repr: Option<Ident> = None;
let mut integer = false;

for attr in &input.attrs {
if attr.path.is_ident(ATTR_NAME) {
abort!(
attr.path,
"`asn1` attribute is not allowed on `Enumerated` types"
);
if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
for meta in nested {
if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
if nv.path.is_ident("type") {
if let Lit::Str(lit) = nv.lit {
match lit.value().as_str() {
"ENUMERATED" => integer = false,
"INTEGER" => integer = true,
s => abort!(lit, "`type = \"{}\"` is unsupported", s),
}
}
}
}
}
}
Comment on lines +46 to +60

@tarcieritarcieriFeb 11, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.

} else if attr.path.is_ident("repr") {
if repr.is_some() {
abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
)
}),
variants,
integer,
}
}

/// Lower the derived output into a [`TokenStream`].
pub fn to_tokens(&self) -> TokenStream {
let ident = &self.ident;
let repr = &self.repr;
let tag = match self.integer {
false => quote! { ::der::Tag::Enumerated },
true => quote! { ::der::Tag::Integer },
};

let mut try_from_body = Vec::new();
for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
}

impl ::der::FixedTag for #ident {
const TAG: ::der::Tag = ::der::Tag::Enumerated;
const TAG: ::der::Tag = #tag;
}

impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
fn try_from(n: #repr) -> ::der::Result<Self> {
match n {
#(#try_from_body)*
_ => Err(der::Tag::Enumerated.value_error())
_ => Err(#tag.value_error())
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion der/derive/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
Expand Down
43 changes: 4 additions & 39 deletions pkcs10/src/version.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
/// Denotes PKCS#8 v1
V1 = 0,
}

impl Decodable<'_> for Version {
fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
}
}

impl Encodable for Version {
fn encoded_len(&self) -> der::Result<der::Length> {
der::Length::from(1u8).for_tlv()
}

fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
u8::from(*self).encode(encoder)
}
}

impl From<Version> for u8 {
fn from(version: Version) -> Self {
version as u8
}
}

impl TryFrom<u8> for Version {
type Error = der::Error;

fn try_from(byte: u8) -> Result<Version, der::Error> {
match byte {
0 => Ok(Version::V1),
_ => Err(Self::TAG.value_error()),
}
}
}

impl FixedTag for Version {
const TAG: Tag = Tag::Integer;
}
31 changes: 27 additions & 4 deletions x509/src/certificate.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
/// Version 1 (default)
V1 = 0,

/// Version 2
V2 = 1,

/// Version 3
V3 = 2,
}

impl Default for Version {
fn default() -> Self {
Self::V1
}
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
/// version [0] Version DEFAULT v1,
//#[asn1(context_specific = "0", default = "Default::default")]
pub version: u8,
pub version: Version,
/// serialNumber CertificateSerialNumber,
pub serial_number: UIntBytes<'a>,
/// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down
2 changes: 1 addition & 1 deletion x509/tests/certificate.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
let result = Certificate::from_der(der_encoded_cert);
let cert: Certificate = result.unwrap();

assert_eq!(cert.tbs_certificate.version, 2);
assert_eq!(cert.tbs_certificate.version, Version::V3);
let target_serial: [u8; 16] = [
0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
0x02,
Expand Down
2 changes: 1 addition & 1 deletion x509/tests/pkix_extensions.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
let result = Certificate::from_der(der_encoded_cert);
let cert: Certificate = result.unwrap();

assert_eq!(cert.tbs_certificate.version, 2);
assert_eq!(cert.tbs_certificate.version, Version::V3);
let target_serial: [u8; 1] = [2];
assert_eq!(
cert.tbs_certificate.serial_number,
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" + '

Skip to content
Derived Version Structs#410

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

from

Feb 11, 2022
 Merged


Derived Version Structs
#410
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f6ee1a4

der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)


npmccallum Feb 10, 2022
ea00dfc

Derive Integer for pkcs10::Version


npmccallum Feb 10, 2022
fdc0dd5

Add a Version enum to x509


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


34 changes: 27 additions & 7 deletions
der/derive/src/enumerated.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
 /// Value of the `repr` attribute.
 repr: Ident,

 /// Whether or not to tag the enum as an integer
 integer: bool,


Comment on lines

+22
 to 
+24

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.
 /// Variants of this enum.
 variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

 // Reject `asn1` attributes, parse the `repr` attribute
 let mut repr: Option<Ident> = None;
 let mut integer = false;

 for attr in &input.attrs {
 if attr.path.is_ident(ATTR_NAME) {
 abort!(
 attr.path,
 "`asn1` attribute is not allowed on `Enumerated` types"
 );
 if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
 for meta in nested {
 if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
 if nv.path.is_ident("type") {
 if let Lit::Str(lit) = nv.lit {
 match lit.value().as_str() {
 "ENUMERATED" => integer = false,
 "INTEGER" => integer = true,
 s => abort!(lit, "`type = \"{}\"` is unsupported", s),
 }
 }
 }
 }
 }
 }

Comment on lines

+46
 to 
+60

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.
 } else if attr.path.is_ident("repr") {
 if repr.is_some() {
 abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
 )
 }),
 variants,
 integer,
 }
 }

 /// Lower the derived output into a [`TokenStream`].
 pub fn to_tokens(&self) -> TokenStream {
 let ident = &self.ident;
 let repr = &self.repr;
 let tag = match self.integer {
 false => quote! { ::der::Tag::Enumerated },
 true => quote! { ::der::Tag::Integer },
 };

 let mut try_from_body = Vec::new();
 for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
 }

 impl ::der::FixedTag for #ident {
 const TAG: ::der::Tag = ::der::Tag::Enumerated;
 const TAG: ::der::Tag = #tag;
 }

 impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
 fn try_from(n: #repr) -> ::der::Result<Self> {
 match n {
 #(#try_from_body)*
 _ => Err(der::Tag::Enumerated.value_error())
 _ => Err(#tag.value_error())
 }
 }
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
 let input = parse_macro_input!(input as DeriveInput);
Expand Down

43 changes: 4 additions & 39 deletions
pkcs10/src/version.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Denotes PKCS#8 v1
 V1 = 0,
}

impl Decodable<'_> for Version {
 fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
 Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
 }
}

impl Encodable for Version {
 fn encoded_len(&self) -> der::Result<der::Length> {
 der::Length::from(1u8).for_tlv()
 }

 fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
 u8::from(*self).encode(encoder)
 }
}

impl From<Version> for u8 {
 fn from(version: Version) -> Self {
 version as u8
 }
}

impl TryFrom<u8> for Version {
 type Error = der::Error;

 fn try_from(byte: u8) -> Result<Version, der::Error> {
 match byte {
 0 => Ok(Version::V1),
 _ => Err(Self::TAG.value_error()),
 }
 }
}

impl FixedTag for Version {
 const TAG: Tag = Tag::Integer;
}

31 changes: 27 additions & 4 deletions
x509/src/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Version 1 (default)
 V1 = 0,

 /// Version 2
 V2 = 1,

 /// Version 3
 V3 = 2,
}

impl Default for Version {
 fn default() -> Self {
 Self::V1
 }
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
 /// version [0] Version DEFAULT v1,
 //#[asn1(context_specific = "0", default = "Default::default")]
 pub version: u8,
 pub version: Version,
 /// serialNumber CertificateSerialNumber,
 pub serial_number: UIntBytes<'a>,
 /// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 16] = [
 0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
 0x02,
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/pkix_extensions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 1] = [2];
 assert_eq!(
 cert.tbs_certificate.serial_number,
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('^' + ".*" + '

Skip to content
Derived Version Structs#410

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

from

Feb 11, 2022
 Merged


Derived Version Structs
#410
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f6ee1a4

der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)


npmccallum Feb 10, 2022
ea00dfc

Derive Integer for pkcs10::Version


npmccallum Feb 10, 2022
fdc0dd5

Add a Version enum to x509


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


34 changes: 27 additions & 7 deletions
der/derive/src/enumerated.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
 /// Value of the `repr` attribute.
 repr: Ident,

 /// Whether or not to tag the enum as an integer
 integer: bool,


Comment on lines

+22
 to 
+24

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.
 /// Variants of this enum.
 variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

 // Reject `asn1` attributes, parse the `repr` attribute
 let mut repr: Option<Ident> = None;
 let mut integer = false;

 for attr in &input.attrs {
 if attr.path.is_ident(ATTR_NAME) {
 abort!(
 attr.path,
 "`asn1` attribute is not allowed on `Enumerated` types"
 );
 if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
 for meta in nested {
 if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
 if nv.path.is_ident("type") {
 if let Lit::Str(lit) = nv.lit {
 match lit.value().as_str() {
 "ENUMERATED" => integer = false,
 "INTEGER" => integer = true,
 s => abort!(lit, "`type = \"{}\"` is unsupported", s),
 }
 }
 }
 }
 }
 }

Comment on lines

+46
 to 
+60

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.
 } else if attr.path.is_ident("repr") {
 if repr.is_some() {
 abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
 )
 }),
 variants,
 integer,
 }
 }

 /// Lower the derived output into a [`TokenStream`].
 pub fn to_tokens(&self) -> TokenStream {
 let ident = &self.ident;
 let repr = &self.repr;
 let tag = match self.integer {
 false => quote! { ::der::Tag::Enumerated },
 true => quote! { ::der::Tag::Integer },
 };

 let mut try_from_body = Vec::new();
 for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
 }

 impl ::der::FixedTag for #ident {
 const TAG: ::der::Tag = ::der::Tag::Enumerated;
 const TAG: ::der::Tag = #tag;
 }

 impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
 fn try_from(n: #repr) -> ::der::Result<Self> {
 match n {
 #(#try_from_body)*
 _ => Err(der::Tag::Enumerated.value_error())
 _ => Err(#tag.value_error())
 }
 }
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
 let input = parse_macro_input!(input as DeriveInput);
Expand Down

43 changes: 4 additions & 39 deletions
pkcs10/src/version.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Denotes PKCS#8 v1
 V1 = 0,
}

impl Decodable<'_> for Version {
 fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
 Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
 }
}

impl Encodable for Version {
 fn encoded_len(&self) -> der::Result<der::Length> {
 der::Length::from(1u8).for_tlv()
 }

 fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
 u8::from(*self).encode(encoder)
 }
}

impl From<Version> for u8 {
 fn from(version: Version) -> Self {
 version as u8
 }
}

impl TryFrom<u8> for Version {
 type Error = der::Error;

 fn try_from(byte: u8) -> Result<Version, der::Error> {
 match byte {
 0 => Ok(Version::V1),
 _ => Err(Self::TAG.value_error()),
 }
 }
}

impl FixedTag for Version {
 const TAG: Tag = Tag::Integer;
}

31 changes: 27 additions & 4 deletions
x509/src/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Version 1 (default)
 V1 = 0,

 /// Version 2
 V2 = 1,

 /// Version 3
 V3 = 2,
}

impl Default for Version {
 fn default() -> Self {
 Self::V1
 }
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
 /// version [0] Version DEFAULT v1,
 //#[asn1(context_specific = "0", default = "Default::default")]
 pub version: u8,
 pub version: Version,
 /// serialNumber CertificateSerialNumber,
 pub serial_number: UIntBytes<'a>,
 /// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 16] = [
 0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
 0x02,
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/pkix_extensions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 1] = [2];
 assert_eq!(
 cert.tbs_certificate.serial_number,
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('^' + ".*" + '

Skip to content
Derived Version Structs#410

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

from

Feb 11, 2022
 Merged


Derived Version Structs
#410
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f6ee1a4

der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)


npmccallum Feb 10, 2022
ea00dfc

Derive Integer for pkcs10::Version


npmccallum Feb 10, 2022
fdc0dd5

Add a Version enum to x509


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


34 changes: 27 additions & 7 deletions
der/derive/src/enumerated.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
 /// Value of the `repr` attribute.
 repr: Ident,

 /// Whether or not to tag the enum as an integer
 integer: bool,


Comment on lines

+22
 to 
+24

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.
 /// Variants of this enum.
 variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

 // Reject `asn1` attributes, parse the `repr` attribute
 let mut repr: Option<Ident> = None;
 let mut integer = false;

 for attr in &input.attrs {
 if attr.path.is_ident(ATTR_NAME) {
 abort!(
 attr.path,
 "`asn1` attribute is not allowed on `Enumerated` types"
 );
 if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
 for meta in nested {
 if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
 if nv.path.is_ident("type") {
 if let Lit::Str(lit) = nv.lit {
 match lit.value().as_str() {
 "ENUMERATED" => integer = false,
 "INTEGER" => integer = true,
 s => abort!(lit, "`type = \"{}\"` is unsupported", s),
 }
 }
 }
 }
 }
 }

Comment on lines

+46
 to 
+60

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.
 } else if attr.path.is_ident("repr") {
 if repr.is_some() {
 abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
 )
 }),
 variants,
 integer,
 }
 }

 /// Lower the derived output into a [`TokenStream`].
 pub fn to_tokens(&self) -> TokenStream {
 let ident = &self.ident;
 let repr = &self.repr;
 let tag = match self.integer {
 false => quote! { ::der::Tag::Enumerated },
 true => quote! { ::der::Tag::Integer },
 };

 let mut try_from_body = Vec::new();
 for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
 }

 impl ::der::FixedTag for #ident {
 const TAG: ::der::Tag = ::der::Tag::Enumerated;
 const TAG: ::der::Tag = #tag;
 }

 impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
 fn try_from(n: #repr) -> ::der::Result<Self> {
 match n {
 #(#try_from_body)*
 _ => Err(der::Tag::Enumerated.value_error())
 _ => Err(#tag.value_error())
 }
 }
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
 let input = parse_macro_input!(input as DeriveInput);
Expand Down

43 changes: 4 additions & 39 deletions
pkcs10/src/version.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Denotes PKCS#8 v1
 V1 = 0,
}

impl Decodable<'_> for Version {
 fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
 Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
 }
}

impl Encodable for Version {
 fn encoded_len(&self) -> der::Result<der::Length> {
 der::Length::from(1u8).for_tlv()
 }

 fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
 u8::from(*self).encode(encoder)
 }
}

impl From<Version> for u8 {
 fn from(version: Version) -> Self {
 version as u8
 }
}

impl TryFrom<u8> for Version {
 type Error = der::Error;

 fn try_from(byte: u8) -> Result<Version, der::Error> {
 match byte {
 0 => Ok(Version::V1),
 _ => Err(Self::TAG.value_error()),
 }
 }
}

impl FixedTag for Version {
 const TAG: Tag = Tag::Integer;
}

31 changes: 27 additions & 4 deletions
x509/src/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Version 1 (default)
 V1 = 0,

 /// Version 2
 V2 = 1,

 /// Version 3
 V3 = 2,
}

impl Default for Version {
 fn default() -> Self {
 Self::V1
 }
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
 /// version [0] Version DEFAULT v1,
 //#[asn1(context_specific = "0", default = "Default::default")]
 pub version: u8,
 pub version: Version,
 /// serialNumber CertificateSerialNumber,
 pub serial_number: UIntBytes<'a>,
 /// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 16] = [
 0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
 0x02,
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/pkix_extensions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 1] = [2];
 assert_eq!(
 cert.tbs_certificate.serial_number,
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" + '

Skip to content
Derived Version Structs#410

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

from

Feb 11, 2022
 Merged


Derived Version Structs
#410
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f6ee1a4

der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)


npmccallum Feb 10, 2022
ea00dfc

Derive Integer for pkcs10::Version


npmccallum Feb 10, 2022
fdc0dd5

Add a Version enum to x509


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


34 changes: 27 additions & 7 deletions
der/derive/src/enumerated.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
 /// Value of the `repr` attribute.
 repr: Ident,

 /// Whether or not to tag the enum as an integer
 integer: bool,


Comment on lines

+22
 to 
+24

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.
 /// Variants of this enum.
 variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

 // Reject `asn1` attributes, parse the `repr` attribute
 let mut repr: Option<Ident> = None;
 let mut integer = false;

 for attr in &input.attrs {
 if attr.path.is_ident(ATTR_NAME) {
 abort!(
 attr.path,
 "`asn1` attribute is not allowed on `Enumerated` types"
 );
 if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
 for meta in nested {
 if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
 if nv.path.is_ident("type") {
 if let Lit::Str(lit) = nv.lit {
 match lit.value().as_str() {
 "ENUMERATED" => integer = false,
 "INTEGER" => integer = true,
 s => abort!(lit, "`type = \"{}\"` is unsupported", s),
 }
 }
 }
 }
 }
 }

Comment on lines

+46
 to 
+60

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.
 } else if attr.path.is_ident("repr") {
 if repr.is_some() {
 abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
 )
 }),
 variants,
 integer,
 }
 }

 /// Lower the derived output into a [`TokenStream`].
 pub fn to_tokens(&self) -> TokenStream {
 let ident = &self.ident;
 let repr = &self.repr;
 let tag = match self.integer {
 false => quote! { ::der::Tag::Enumerated },
 true => quote! { ::der::Tag::Integer },
 };

 let mut try_from_body = Vec::new();
 for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
 }

 impl ::der::FixedTag for #ident {
 const TAG: ::der::Tag = ::der::Tag::Enumerated;
 const TAG: ::der::Tag = #tag;
 }

 impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
 fn try_from(n: #repr) -> ::der::Result<Self> {
 match n {
 #(#try_from_body)*
 _ => Err(der::Tag::Enumerated.value_error())
 _ => Err(#tag.value_error())
 }
 }
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
 let input = parse_macro_input!(input as DeriveInput);
Expand Down

43 changes: 4 additions & 39 deletions
pkcs10/src/version.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Denotes PKCS#8 v1
 V1 = 0,
}

impl Decodable<'_> for Version {
 fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
 Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
 }
}

impl Encodable for Version {
 fn encoded_len(&self) -> der::Result<der::Length> {
 der::Length::from(1u8).for_tlv()
 }

 fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
 u8::from(*self).encode(encoder)
 }
}

impl From<Version> for u8 {
 fn from(version: Version) -> Self {
 version as u8
 }
}

impl TryFrom<u8> for Version {
 type Error = der::Error;

 fn try_from(byte: u8) -> Result<Version, der::Error> {
 match byte {
 0 => Ok(Version::V1),
 _ => Err(Self::TAG.value_error()),
 }
 }
}

impl FixedTag for Version {
 const TAG: Tag = Tag::Integer;
}

31 changes: 27 additions & 4 deletions
x509/src/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Version 1 (default)
 V1 = 0,

 /// Version 2
 V2 = 1,

 /// Version 3
 V3 = 2,
}

impl Default for Version {
 fn default() -> Self {
 Self::V1
 }
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
 /// version [0] Version DEFAULT v1,
 //#[asn1(context_specific = "0", default = "Default::default")]
 pub version: u8,
 pub version: Version,
 /// serialNumber CertificateSerialNumber,
 pub serial_number: UIntBytes<'a>,
 /// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 16] = [
 0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
 0x02,
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/pkix_extensions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 1] = [2];
 assert_eq!(
 cert.tbs_certificate.serial_number,
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('^' + ".*" + '

Skip to content
Derived Version Structs#410

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

from

Feb 11, 2022
 Merged


Derived Version Structs
#410
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f6ee1a4

der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)


npmccallum Feb 10, 2022
ea00dfc

Derive Integer for pkcs10::Version


npmccallum Feb 10, 2022
fdc0dd5

Add a Version enum to x509


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


34 changes: 27 additions & 7 deletions
der/derive/src/enumerated.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
 /// Value of the `repr` attribute.
 repr: Ident,

 /// Whether or not to tag the enum as an integer
 integer: bool,


Comment on lines

+22
 to 
+24

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.
 /// Variants of this enum.
 variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

 // Reject `asn1` attributes, parse the `repr` attribute
 let mut repr: Option<Ident> = None;
 let mut integer = false;

 for attr in &input.attrs {
 if attr.path.is_ident(ATTR_NAME) {
 abort!(
 attr.path,
 "`asn1` attribute is not allowed on `Enumerated` types"
 );
 if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
 for meta in nested {
 if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
 if nv.path.is_ident("type") {
 if let Lit::Str(lit) = nv.lit {
 match lit.value().as_str() {
 "ENUMERATED" => integer = false,
 "INTEGER" => integer = true,
 s => abort!(lit, "`type = \"{}\"` is unsupported", s),
 }
 }
 }
 }
 }
 }

Comment on lines

+46
 to 
+60

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.
 } else if attr.path.is_ident("repr") {
 if repr.is_some() {
 abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
 )
 }),
 variants,
 integer,
 }
 }

 /// Lower the derived output into a [`TokenStream`].
 pub fn to_tokens(&self) -> TokenStream {
 let ident = &self.ident;
 let repr = &self.repr;
 let tag = match self.integer {
 false => quote! { ::der::Tag::Enumerated },
 true => quote! { ::der::Tag::Integer },
 };

 let mut try_from_body = Vec::new();
 for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
 }

 impl ::der::FixedTag for #ident {
 const TAG: ::der::Tag = ::der::Tag::Enumerated;
 const TAG: ::der::Tag = #tag;
 }

 impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
 fn try_from(n: #repr) -> ::der::Result<Self> {
 match n {
 #(#try_from_body)*
 _ => Err(der::Tag::Enumerated.value_error())
 _ => Err(#tag.value_error())
 }
 }
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
 let input = parse_macro_input!(input as DeriveInput);
Expand Down

43 changes: 4 additions & 39 deletions
pkcs10/src/version.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Denotes PKCS#8 v1
 V1 = 0,
}

impl Decodable<'_> for Version {
 fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
 Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
 }
}

impl Encodable for Version {
 fn encoded_len(&self) -> der::Result<der::Length> {
 der::Length::from(1u8).for_tlv()
 }

 fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
 u8::from(*self).encode(encoder)
 }
}

impl From<Version> for u8 {
 fn from(version: Version) -> Self {
 version as u8
 }
}

impl TryFrom<u8> for Version {
 type Error = der::Error;

 fn try_from(byte: u8) -> Result<Version, der::Error> {
 match byte {
 0 => Ok(Version::V1),
 _ => Err(Self::TAG.value_error()),
 }
 }
}

impl FixedTag for Version {
 const TAG: Tag = Tag::Integer;
}

31 changes: 27 additions & 4 deletions
x509/src/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Version 1 (default)
 V1 = 0,

 /// Version 2
 V2 = 1,

 /// Version 3
 V3 = 2,
}

impl Default for Version {
 fn default() -> Self {
 Self::V1
 }
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
 /// version [0] Version DEFAULT v1,
 //#[asn1(context_specific = "0", default = "Default::default")]
 pub version: u8,
 pub version: Version,
 /// serialNumber CertificateSerialNumber,
 pub serial_number: UIntBytes<'a>,
 /// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 16] = [
 0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
 0x02,
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/pkix_extensions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 1] = [2];
 assert_eq!(
 cert.tbs_certificate.serial_number,
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('^' + ".*" + '

Skip to content
Derived Version Structs#410

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

from

Feb 11, 2022
 Merged


Derived Version Structs
#410
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f6ee1a4

der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)


npmccallum Feb 10, 2022
ea00dfc

Derive Integer for pkcs10::Version


npmccallum Feb 10, 2022
fdc0dd5

Add a Version enum to x509


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


34 changes: 27 additions & 7 deletions
der/derive/src/enumerated.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
 /// Value of the `repr` attribute.
 repr: Ident,

 /// Whether or not to tag the enum as an integer
 integer: bool,


Comment on lines

+22
 to 
+24

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.
 /// Variants of this enum.
 variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

 // Reject `asn1` attributes, parse the `repr` attribute
 let mut repr: Option<Ident> = None;
 let mut integer = false;

 for attr in &input.attrs {
 if attr.path.is_ident(ATTR_NAME) {
 abort!(
 attr.path,
 "`asn1` attribute is not allowed on `Enumerated` types"
 );
 if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
 for meta in nested {
 if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
 if nv.path.is_ident("type") {
 if let Lit::Str(lit) = nv.lit {
 match lit.value().as_str() {
 "ENUMERATED" => integer = false,
 "INTEGER" => integer = true,
 s => abort!(lit, "`type = \"{}\"` is unsupported", s),
 }
 }
 }
 }
 }
 }

Comment on lines

+46
 to 
+60

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.
 } else if attr.path.is_ident("repr") {
 if repr.is_some() {
 abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
 )
 }),
 variants,
 integer,
 }
 }

 /// Lower the derived output into a [`TokenStream`].
 pub fn to_tokens(&self) -> TokenStream {
 let ident = &self.ident;
 let repr = &self.repr;
 let tag = match self.integer {
 false => quote! { ::der::Tag::Enumerated },
 true => quote! { ::der::Tag::Integer },
 };

 let mut try_from_body = Vec::new();
 for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
 }

 impl ::der::FixedTag for #ident {
 const TAG: ::der::Tag = ::der::Tag::Enumerated;
 const TAG: ::der::Tag = #tag;
 }

 impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
 fn try_from(n: #repr) -> ::der::Result<Self> {
 match n {
 #(#try_from_body)*
 _ => Err(der::Tag::Enumerated.value_error())
 _ => Err(#tag.value_error())
 }
 }
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
 let input = parse_macro_input!(input as DeriveInput);
Expand Down

43 changes: 4 additions & 39 deletions
pkcs10/src/version.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Denotes PKCS#8 v1
 V1 = 0,
}

impl Decodable<'_> for Version {
 fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
 Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
 }
}

impl Encodable for Version {
 fn encoded_len(&self) -> der::Result<der::Length> {
 der::Length::from(1u8).for_tlv()
 }

 fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
 u8::from(*self).encode(encoder)
 }
}

impl From<Version> for u8 {
 fn from(version: Version) -> Self {
 version as u8
 }
}

impl TryFrom<u8> for Version {
 type Error = der::Error;

 fn try_from(byte: u8) -> Result<Version, der::Error> {
 match byte {
 0 => Ok(Version::V1),
 _ => Err(Self::TAG.value_error()),
 }
 }
}

impl FixedTag for Version {
 const TAG: Tag = Tag::Integer;
}

31 changes: 27 additions & 4 deletions
x509/src/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Version 1 (default)
 V1 = 0,

 /// Version 2
 V2 = 1,

 /// Version 3
 V3 = 2,
}

impl Default for Version {
 fn default() -> Self {
 Self::V1
 }
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
 /// version [0] Version DEFAULT v1,
 //#[asn1(context_specific = "0", default = "Default::default")]
 pub version: u8,
 pub version: Version,
 /// serialNumber CertificateSerialNumber,
 pub serial_number: UIntBytes<'a>,
 /// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 16] = [
 0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
 0x02,
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/pkix_extensions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 1] = [2];
 assert_eq!(
 cert.tbs_certificate.serial_number,
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); }
})();
})();

Skip to content
Derived Version Structs#410

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

from

Feb 11, 2022
 Merged


Derived Version Structs
#410
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f6ee1a4

der: allow `#[asn1(type = "INTEGER")]` on derive(Enumerated)


npmccallum Feb 10, 2022
ea00dfc

Derive Integer for pkcs10::Version


npmccallum Feb 10, 2022
fdc0dd5

Add a Version enum to x509


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


34 changes: 27 additions & 7 deletions
der/derive/src/enumerated.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ use crate::ATTR_NAME;
use proc_macro2::TokenStream;
use proc_macro_error::abort;
use quote::quote;
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Variant};
use syn::{DeriveInput, Expr, ExprLit, Ident, Lit, LitInt, Meta, MetaList, NestedMeta, Variant};

/// Valid options for the `#[repr]` attribute on `Enumerated` types.
const REPR_TYPES: &[&str] = &["u8", "u16", "u32"];
Expand All@@ -19,6 +19,9 @@ pub(crate) struct DeriveEnumerated {
 /// Value of the `repr` attribute.
 repr: Ident,

 /// Whether or not to tag the enum as an integer
 integer: bool,


Comment on lines

+22
 to 
+24

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This seems like an inextensible way to override the tag of an Enumerated, so why not just add a #[asn1(tag = "...")] argument instead that lets you override the ENUMERATED tag however you want? Then it could potentially work for more than just INTEGER.
 /// Variants of this enum.
 variants: Vec<EnumeratedVariant>,
}
Expand All@@ -36,13 +39,25 @@ impl DeriveEnumerated {

 // Reject `asn1` attributes, parse the `repr` attribute
 let mut repr: Option<Ident> = None;
 let mut integer = false;

 for attr in &input.attrs {
 if attr.path.is_ident(ATTR_NAME) {
 abort!(
 attr.path,
 "`asn1` attribute is not allowed on `Enumerated` types"
 );
 if let Ok(Meta::List(MetaList { nested, .. })) = attr.parse_meta() {
 for meta in nested {
 if let NestedMeta::Meta(Meta::NameValue(nv)) = meta {
 if nv.path.is_ident("type") {
 if let Lit::Str(lit) = nv.lit {
 match lit.value().as_str() {
 "ENUMERATED" => integer = false,
 "INTEGER" => integer = true,
 s => abort!(lit, "`type = \"{}\"` is unsupported", s),
 }
 }
 }
 }
 }
 }

Comment on lines

+46
 to 
+60

@tarcieritarcieriFeb 11, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This is... less than ideal, but I have some ideas about how to refactor this along with attribute parsing in general which I can do in a followup PR.
 } else if attr.path.is_ident("repr") {
 if repr.is_some() {
 abort!(
Expand DownExpand Up@@ -81,13 +96,18 @@ impl DeriveEnumerated {
 )
 }),
 variants,
 integer,
 }
 }

 /// Lower the derived output into a [`TokenStream`].
 pub fn to_tokens(&self) -> TokenStream {
 let ident = &self.ident;
 let repr = &self.repr;
 let tag = match self.integer {
 false => quote! { ::der::Tag::Enumerated },
 true => quote! { ::der::Tag::Integer },
 };

 let mut try_from_body = Vec::new();
 for variant in &self.variants {
Expand DownExpand Up@@ -115,7 +135,7 @@ impl DeriveEnumerated {
 }

 impl ::der::FixedTag for #ident {
 const TAG: ::der::Tag = ::der::Tag::Enumerated;
 const TAG: ::der::Tag = #tag;
 }

 impl TryFrom<#repr> for #ident {
Expand All@@ -124,7 +144,7 @@ impl DeriveEnumerated {
 fn try_from(n: #repr) -> ::der::Result<Self> {
 match n {
 #(#try_from_body)*
 _ => Err(der::Tag::Enumerated.value_error())
 _ => Err(#tag.value_error())
 }
 }
 }
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,7 +210,7 @@ pub fn derive_choice(input: TokenStream) -> TokenStream {
///
/// Note that the derive macro will write a `TryFrom<...>` impl for the
/// provided `#[repr]`, which is used by the decoder.
#[proc_macro_derive(Enumerated)]
#[proc_macro_derive(Enumerated, attributes(asn1))]
#[proc_macro_error]
pub fn derive_enumerated(input: TokenStream) -> TokenStream {
 let input = parse_macro_input!(input as DeriveInput);
Expand Down

43 changes: 4 additions & 39 deletions
pkcs10/src/version.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,14 @@
//! Certification request information version identifier.

use der::{Decodable, Decoder, Encodable, Encoder, FixedTag, Tag};
use der::Enumerated;

/// Version identifier for certification request information.
///
/// (RFC 2986 designates `0` as the only valid version)
#[derive(Clone, Debug, Copy, PartialEq, Eq)]
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Denotes PKCS#8 v1
 V1 = 0,
}

impl Decodable<'_> for Version {
 fn decode(decoder: &mut Decoder<'_>) -> der::Result<Self> {
 Version::try_from(u8::decode(decoder)?).map_err(|_| Self::TAG.value_error())
 }
}

impl Encodable for Version {
 fn encoded_len(&self) -> der::Result<der::Length> {
 der::Length::from(1u8).for_tlv()
 }

 fn encode(&self, encoder: &mut Encoder<'_>) -> der::Result<()> {
 u8::from(*self).encode(encoder)
 }
}

impl From<Version> for u8 {
 fn from(version: Version) -> Self {
 version as u8
 }
}

impl TryFrom<u8> for Version {
 type Error = der::Error;

 fn try_from(byte: u8) -> Result<Version, der::Error> {
 match byte {
 0 => Ok(Version::V1),
 _ => Err(Self::TAG.value_error()),
 }
 }
}

impl FixedTag for Version {
 const TAG: Tag = Tag::Integer;
}

31 changes: 27 additions & 4 deletions
x509/src/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
//! Certificate [`Certificate`] and TBSCertificate [`TBSCertificate`] as defined in RFC 5280

use der::asn1::{BitString, ContextSpecific, ObjectIdentifier, UIntBytes};
use der::{Sequence, TagMode, TagNumber};
use der::{Enumerated, Sequence, TagMode, TagNumber};
use spki::{AlgorithmIdentifier, SubjectPublicKeyInfo};
use x501::name::Name;
use x501::time::Validity;

/// only support v3 certificates
/// Certificate `Version` as defined in [RFC 5280 Section 4.1].
///
/// ```text
/// Version ::= INTEGER { v1(0), v2(1), v3(2) }
pub const X509_CERT_VERSION: u8 = 2;
/// ```
///
/// [RFC 5280 Section 4.1]: https://datatracker.ietf.org/doc/html/rfc5280#section-4.1
#[derive(Clone, Debug, Copy, PartialEq, Eq, Enumerated)]
#[asn1(type = "INTEGER")]
#[repr(u8)]
pub enum Version {
 /// Version 1 (default)
 V1 = 0,

 /// Version 2
 V2 = 1,

 /// Version 3
 V3 = 2,
}

impl Default for Version {
 fn default() -> Self {
 Self::V1
 }
}

/// X.509 `TBSCertificate` as defined in [RFC 5280 Section 4.1.2.5]
///
Expand DownExpand Up@@ -39,7 +62,7 @@ pub const X509_CERT_VERSION: u8 = 2;
pub struct TBSCertificate<'a> {
 /// version [0] Version DEFAULT v1,
 //#[asn1(context_specific = "0", default = "Default::default")]
 pub version: u8,
 pub version: Version,
 /// serialNumber CertificateSerialNumber,
 pub serial_number: UIntBytes<'a>,
 /// signature AlgorithmIdentifier{SIGNATURE-ALGORITHM, {SignatureAlgorithms}},
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/certificate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -194,7 +194,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 16] = [
 0x7F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x49, 0xCF, 0x70, 0x66, 0x4D, 0x00, 0x00, 0x00,
 0x02,
Expand Down

2 changes: 1 addition & 1 deletion
x509/tests/pkix_extensions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,7 +601,7 @@ fn decode_cert() {
 let result = Certificate::from_der(der_encoded_cert);
 let cert: Certificate = result.unwrap();

 assert_eq!(cert.tbs_certificate.version, 2);
 assert_eq!(cert.tbs_certificate.version, Version::V3);
 let target_serial: [u8; 1] = [2];
 assert_eq!(
 cert.tbs_certificate.serial_number,
Expand Down