Derive Sequence for more types#363

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

Closed
npmccallum wants to merge 3 commits into from
Closed

Derive Sequence for more types #363

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
0df7532
Derive `Sequence` for `pkcs7` types
npmccallum Jan 31, 2022
f0a9dc4
Derive `Sequence` for `pkcs5` types
npmccallum Jan 31, 2022
bb420b6
Derive `Sequence` for `pkcs1` types
npmccallum Jan 31, 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
25 changes: 2 additions & 23 deletions pkcs1/src/private_key/other_prime_info.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
/// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
/// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
decoder.sequence(|decoder| {
Ok(Self {
prime: decoder.decode()?,
exponent: decoder.decode()?,
coefficient: decoder.decode()?,
})
})
}
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
fn fields<F, T>(&self, f: F) -> der::Result<T>
where
F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
{
f(&[&self.prime, &self.exponent, &self.coefficient])
}
}
24 changes: 2 additions & 22 deletions pkcs1/src/public_key.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
/// `n`: RSA modulus
pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
}
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
decoder.sequence(|decoder| {
Ok(Self {
modulus: decoder.decode()?,
public_exponent: decoder.decode()?,
})
})
}
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
fn fields<F, T>(&self, f: F) -> der::Result<T>
where
F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
{
f(&[&self.modulus, &self.public_exponent])
}
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
type Error = Error;

Expand Down
17 changes: 1 addition & 16 deletions pkcs5/src/pbes2.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
/// Key derivation function
pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
}
}

impl<'a> Decodable<'a> for Parameters<'a> {
fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
decoder.any()?.try_into()
}
}

impl<'a> Sequence<'a> for Parameters<'a> {
fn fields<F, T>(&self, f: F) -> der::Result<T>
where
F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
{
f(&[&self.kdf, &self.encryption])
}
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
type Error = der::Error;

Expand Down
27 changes: 2 additions & 25 deletions pkcs7/src/encrypted_data_content.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
/// the syntax version number.
pub version: Version,

/// the encrypted content information.
pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
decoder.sequence(|decoder| {
Ok(EncryptedDataContent {
version: decoder.decode()?,
encrypted_content_info: decoder.decode()?,
})
})
}
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
fn fields<F, T>(&self, f: F) -> der::Result<T>
where
F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
{
f(&[&self.version, &self.encrypted_content_info])
}
}
, '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
Derive Sequence for more types#363

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

 Closed

npmccallum
wants to merge
3
commits into

from

 Closed


Derive Sequence for more types
#363
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
0df7532

Derive `Sequence` for `pkcs7` types


npmccallum Jan 31, 2022
f0a9dc4

Derive `Sequence` for `pkcs5` types


npmccallum Jan 31, 2022
bb420b6

Derive `Sequence` for `pkcs1` types


npmccallum Jan 31, 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


25 changes: 2 additions & 23 deletions
pkcs1/src/private_key/other_prime_info.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
 /// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
 /// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
 pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 prime: decoder.decode()?,
 exponent: decoder.decode()?,
 coefficient: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.prime, &self.exponent, &self.coefficient])
 }
}

24 changes: 2 additions & 22 deletions
pkcs1/src/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
 /// `n`: RSA modulus
 pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
 }
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 modulus: decoder.decode()?,
 public_exponent: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.modulus, &self.public_exponent])
 }
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
 type Error = Error;

Expand Down

17 changes: 1 addition & 16 deletions
pkcs5/src/pbes2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
 /// Key derivation function
 pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
 }
}

impl<'a> Decodable<'a> for Parameters<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.any()?.try_into()
 }
}

impl<'a> Sequence<'a> for Parameters<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.kdf, &self.encryption])
 }
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
 type Error = der::Error;

Expand Down

27 changes: 2 additions & 25 deletions
pkcs7/src/encrypted_data_content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
 Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
 Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
 /// the syntax version number.
 pub version: Version,

 /// the encrypted content information.
 pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
 decoder.sequence(|decoder| {
 Ok(EncryptedDataContent {
 version: decoder.decode()?,
 encrypted_content_info: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.version, &self.encrypted_content_info])
 }
}

, '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
Derive Sequence for more types#363

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

 Closed

npmccallum
wants to merge
3
commits into

from

 Closed


Derive Sequence for more types
#363
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
0df7532

Derive `Sequence` for `pkcs7` types


npmccallum Jan 31, 2022
f0a9dc4

Derive `Sequence` for `pkcs5` types


npmccallum Jan 31, 2022
bb420b6

Derive `Sequence` for `pkcs1` types


npmccallum Jan 31, 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


25 changes: 2 additions & 23 deletions
pkcs1/src/private_key/other_prime_info.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
 /// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
 /// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
 pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 prime: decoder.decode()?,
 exponent: decoder.decode()?,
 coefficient: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.prime, &self.exponent, &self.coefficient])
 }
}

24 changes: 2 additions & 22 deletions
pkcs1/src/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
 /// `n`: RSA modulus
 pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
 }
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 modulus: decoder.decode()?,
 public_exponent: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.modulus, &self.public_exponent])
 }
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
 type Error = Error;

Expand Down

17 changes: 1 addition & 16 deletions
pkcs5/src/pbes2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
 /// Key derivation function
 pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
 }
}

impl<'a> Decodable<'a> for Parameters<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.any()?.try_into()
 }
}

impl<'a> Sequence<'a> for Parameters<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.kdf, &self.encryption])
 }
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
 type Error = der::Error;

Expand Down

27 changes: 2 additions & 25 deletions
pkcs7/src/encrypted_data_content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
 Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
 Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
 /// the syntax version number.
 pub version: Version,

 /// the encrypted content information.
 pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
 decoder.sequence(|decoder| {
 Ok(EncryptedDataContent {
 version: decoder.decode()?,
 encrypted_content_info: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.version, &self.encrypted_content_info])
 }
}

, '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
Derive Sequence for more types#363

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

 Closed

npmccallum
wants to merge
3
commits into

from

 Closed


Derive Sequence for more types
#363
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
0df7532

Derive `Sequence` for `pkcs7` types


npmccallum Jan 31, 2022
f0a9dc4

Derive `Sequence` for `pkcs5` types


npmccallum Jan 31, 2022
bb420b6

Derive `Sequence` for `pkcs1` types


npmccallum Jan 31, 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


25 changes: 2 additions & 23 deletions
pkcs1/src/private_key/other_prime_info.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
 /// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
 /// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
 pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 prime: decoder.decode()?,
 exponent: decoder.decode()?,
 coefficient: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.prime, &self.exponent, &self.coefficient])
 }
}

24 changes: 2 additions & 22 deletions
pkcs1/src/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
 /// `n`: RSA modulus
 pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
 }
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 modulus: decoder.decode()?,
 public_exponent: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.modulus, &self.public_exponent])
 }
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
 type Error = Error;

Expand Down

17 changes: 1 addition & 16 deletions
pkcs5/src/pbes2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
 /// Key derivation function
 pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
 }
}

impl<'a> Decodable<'a> for Parameters<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.any()?.try_into()
 }
}

impl<'a> Sequence<'a> for Parameters<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.kdf, &self.encryption])
 }
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
 type Error = der::Error;

Expand Down

27 changes: 2 additions & 25 deletions
pkcs7/src/encrypted_data_content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
 Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
 Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
 /// the syntax version number.
 pub version: Version,

 /// the encrypted content information.
 pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
 decoder.sequence(|decoder| {
 Ok(EncryptedDataContent {
 version: decoder.decode()?,
 encrypted_content_info: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.version, &self.encrypted_content_info])
 }
}

, '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
Derive Sequence for more types#363

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

 Closed

npmccallum
wants to merge
3
commits into

from

 Closed


Derive Sequence for more types
#363
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
0df7532

Derive `Sequence` for `pkcs7` types


npmccallum Jan 31, 2022
f0a9dc4

Derive `Sequence` for `pkcs5` types


npmccallum Jan 31, 2022
bb420b6

Derive `Sequence` for `pkcs1` types


npmccallum Jan 31, 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


25 changes: 2 additions & 23 deletions
pkcs1/src/private_key/other_prime_info.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
 /// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
 /// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
 pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 prime: decoder.decode()?,
 exponent: decoder.decode()?,
 coefficient: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.prime, &self.exponent, &self.coefficient])
 }
}

24 changes: 2 additions & 22 deletions
pkcs1/src/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
 /// `n`: RSA modulus
 pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
 }
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 modulus: decoder.decode()?,
 public_exponent: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.modulus, &self.public_exponent])
 }
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
 type Error = Error;

Expand Down

17 changes: 1 addition & 16 deletions
pkcs5/src/pbes2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
 /// Key derivation function
 pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
 }
}

impl<'a> Decodable<'a> for Parameters<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.any()?.try_into()
 }
}

impl<'a> Sequence<'a> for Parameters<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.kdf, &self.encryption])
 }
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
 type Error = der::Error;

Expand Down

27 changes: 2 additions & 25 deletions
pkcs7/src/encrypted_data_content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
 Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
 Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
 /// the syntax version number.
 pub version: Version,

 /// the encrypted content information.
 pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
 decoder.sequence(|decoder| {
 Ok(EncryptedDataContent {
 version: decoder.decode()?,
 encrypted_content_info: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.version, &self.encrypted_content_info])
 }
}

, '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
Derive Sequence for more types#363

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

 Closed

npmccallum
wants to merge
3
commits into

from

 Closed


Derive Sequence for more types
#363
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
0df7532

Derive `Sequence` for `pkcs7` types


npmccallum Jan 31, 2022
f0a9dc4

Derive `Sequence` for `pkcs5` types


npmccallum Jan 31, 2022
bb420b6

Derive `Sequence` for `pkcs1` types


npmccallum Jan 31, 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


25 changes: 2 additions & 23 deletions
pkcs1/src/private_key/other_prime_info.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
 /// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
 /// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
 pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 prime: decoder.decode()?,
 exponent: decoder.decode()?,
 coefficient: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.prime, &self.exponent, &self.coefficient])
 }
}

24 changes: 2 additions & 22 deletions
pkcs1/src/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
 /// `n`: RSA modulus
 pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
 }
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 modulus: decoder.decode()?,
 public_exponent: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.modulus, &self.public_exponent])
 }
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
 type Error = Error;

Expand Down

17 changes: 1 addition & 16 deletions
pkcs5/src/pbes2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
 /// Key derivation function
 pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
 }
}

impl<'a> Decodable<'a> for Parameters<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.any()?.try_into()
 }
}

impl<'a> Sequence<'a> for Parameters<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.kdf, &self.encryption])
 }
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
 type Error = der::Error;

Expand Down

27 changes: 2 additions & 25 deletions
pkcs7/src/encrypted_data_content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
 Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
 Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
 /// the syntax version number.
 pub version: Version,

 /// the encrypted content information.
 pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
 decoder.sequence(|decoder| {
 Ok(EncryptedDataContent {
 version: decoder.decode()?,
 encrypted_content_info: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.version, &self.encrypted_content_info])
 }
}

, '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
Derive Sequence for more types#363

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

 Closed

npmccallum
wants to merge
3
commits into

from

 Closed


Derive Sequence for more types
#363
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
0df7532

Derive `Sequence` for `pkcs7` types


npmccallum Jan 31, 2022
f0a9dc4

Derive `Sequence` for `pkcs5` types


npmccallum Jan 31, 2022
bb420b6

Derive `Sequence` for `pkcs1` types


npmccallum Jan 31, 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


25 changes: 2 additions & 23 deletions
pkcs1/src/private_key/other_prime_info.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
 /// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
 /// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
 pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 prime: decoder.decode()?,
 exponent: decoder.decode()?,
 coefficient: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.prime, &self.exponent, &self.coefficient])
 }
}

24 changes: 2 additions & 22 deletions
pkcs1/src/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
 /// `n`: RSA modulus
 pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
 }
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 modulus: decoder.decode()?,
 public_exponent: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.modulus, &self.public_exponent])
 }
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
 type Error = Error;

Expand Down

17 changes: 1 addition & 16 deletions
pkcs5/src/pbes2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
 /// Key derivation function
 pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
 }
}

impl<'a> Decodable<'a> for Parameters<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.any()?.try_into()
 }
}

impl<'a> Sequence<'a> for Parameters<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.kdf, &self.encryption])
 }
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
 type Error = der::Error;

Expand Down

27 changes: 2 additions & 25 deletions
pkcs7/src/encrypted_data_content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
 Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
 Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
 /// the syntax version number.
 pub version: Version,

 /// the encrypted content information.
 pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
 decoder.sequence(|decoder| {
 Ok(EncryptedDataContent {
 version: decoder.decode()?,
 encrypted_content_info: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.version, &self.encrypted_content_info])
 }
}

, '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
Derive Sequence for more types#363

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

 Closed

npmccallum
wants to merge
3
commits into

from

 Closed


Derive Sequence for more types
#363
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
0df7532

Derive `Sequence` for `pkcs7` types


npmccallum Jan 31, 2022
f0a9dc4

Derive `Sequence` for `pkcs5` types


npmccallum Jan 31, 2022
bb420b6

Derive `Sequence` for `pkcs1` types


npmccallum Jan 31, 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


25 changes: 2 additions & 23 deletions
pkcs1/src/private_key/other_prime_info.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
//! PKCS#1 OtherPrimeInfo support.

use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Sequence};

/// PKCS#1 OtherPrimeInfo as defined in [RFC 8017 Appendix 1.2].
///
Expand All@@ -15,7 +15,7 @@ use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
/// ```
///
/// [RFC 8017 Appendix 1.2]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.2
#[derive(Clone)]
#[derive(Clone, Sequence)]
#[cfg_attr(docsrs, doc(cfg(feature = "alloc")))]
pub struct OtherPrimeInfo<'a> {
 /// Prime factor `r_i` of `n`, where `i` >= 3.
Expand All@@ -27,24 +27,3 @@ pub struct OtherPrimeInfo<'a> {
 /// CRT coefficient: `t_i = (r_1 * r_2 * ... * r_(i-1))^(-1) mod r_i`.
 pub coefficient: UIntBytes<'a>,
}

impl<'a> Decodable<'a> for OtherPrimeInfo<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 prime: decoder.decode()?,
 exponent: decoder.decode()?,
 coefficient: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for OtherPrimeInfo<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.prime, &self.exponent, &self.coefficient])
 }
}

24 changes: 2 additions & 22 deletions
pkcs1/src/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
pub(crate) mod document;

use crate::{Error, Result};
use der::{asn1::UIntBytes, Decodable, Decoder, Encodable, Sequence};
use der::{asn1::UIntBytes, Decodable, Sequence};

#[cfg(feature = "alloc")]
use crate::RsaPublicKeyDocument;
Expand All@@ -24,7 +24,7 @@ use {crate::LineEnding, alloc::string::String, der::Document};
/// ```
///
/// [RFC 8017 Appendix 1.1]: https://datatracker.ietf.org/doc/html/rfc8017#appendix-A.1.1
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct RsaPublicKey<'a> {
 /// `n`: RSA modulus
 pub modulus: UIntBytes<'a>,
Expand All@@ -50,26 +50,6 @@ impl<'a> RsaPublicKey<'a> {
 }
}

impl<'a> Decodable<'a> for RsaPublicKey<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.sequence(|decoder| {
 Ok(Self {
 modulus: decoder.decode()?,
 public_exponent: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for RsaPublicKey<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.modulus, &self.public_exponent])
 }
}

impl<'a> TryFrom<&'a [u8]> for RsaPublicKey<'a> {
 type Error = Error;

Expand Down

17 changes: 1 addition & 16 deletions
pkcs5/src/pbes2.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ const DES_BLOCK_SIZE: usize = 8;
/// ```
///
/// [RFC 8018 Appendix A.4]: https://tools.ietf.org/html/rfc8018#appendix-A.4
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Eq, PartialEq, Sequence)]
pub struct Parameters<'a> {
 /// Key derivation function
 pub kdf: Kdf<'a>,
Expand DownExpand Up@@ -197,21 +197,6 @@ impl<'a> Parameters<'a> {
 }
}

impl<'a> Decodable<'a> for Parameters<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<Self> {
 decoder.any()?.try_into()
 }
}

impl<'a> Sequence<'a> for Parameters<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.kdf, &self.encryption])
 }
}

impl<'a> TryFrom<Any<'a>> for Parameters<'a> {
 type Error = der::Error;

Expand Down

27 changes: 2 additions & 25 deletions
pkcs7/src/encrypted_data_content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
//! `encrypted-data` content type [RFC 5652 § 8](https://datatracker.ietf.org/doc/html/rfc5652#section-8)

use crate::enveloped_data_content::EncryptedContentInfo;
use der::{
 Decodable, DecodeValue, Decoder, Encodable, EncodeValue, Encoder, FixedTag, Header, Length,
 Sequence, Tag,
};
use der::{DecodeValue, Decoder, EncodeValue, Encoder, FixedTag, Header, Length, Sequence, Tag};

/// Syntax version of the `encrypted-data` content type.
///
Expand DownExpand Up@@ -73,31 +70,11 @@ impl EncodeValue for Version {
/// - [`version`](EncryptedDataContent::version) is the syntax version number.
/// - [`encrypted_content_info`](EncryptedDataContent::encrypted_content_info) is the encrypted content
/// information, as in [EncryptedContentInfo].
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Sequence)]
pub struct EncryptedDataContent<'a> {
 /// the syntax version number.
 pub version: Version,

 /// the encrypted content information.
 pub encrypted_content_info: EncryptedContentInfo<'a>,
}

impl<'a> Decodable<'a> for EncryptedDataContent<'a> {
 fn decode(decoder: &mut Decoder<'a>) -> der::Result<EncryptedDataContent<'a>> {
 decoder.sequence(|decoder| {
 Ok(EncryptedDataContent {
 version: decoder.decode()?,
 encrypted_content_info: decoder.decode()?,
 })
 })
 }
}

impl<'a> Sequence<'a> for EncryptedDataContent<'a> {
 fn fields<F, T>(&self, f: F) -> der::Result<T>
 where
 F: FnOnce(&[&dyn Encodable]) -> der::Result<T>,
 {
 f(&[&self.version, &self.encrypted_content_info])
 }
}