Skip to content

Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
tarcieri merged 2 commits into from
May 24, 2022
Merged

Bump pkcs1 => 0.4, pkcs8 => 0.9 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9437001
Bump `pkcs1` => 0.4, `pkcs8` => 0.9
sandhose May 10, 2022
b9fe224
Bump MSRV to 1.57
sandhose May 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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
target:
- thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down
36 changes: 18 additions & 18 deletions src/encoding.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
PublicKeyDocument,
DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
}
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
// Check if the key is multi prime
if self.primes.len() > 2 {
return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
);

let private_key = pkcs1::RsaPrivateKey {
modulus: pkcs1::UIntBytes::new(&modulus)?,
public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
prime1: pkcs1::UIntBytes::new(&prime1)?,
prime2: pkcs1::UIntBytes::new(&prime2)?,
exponent1: pkcs1::UIntBytes::new(&exponent1)?,
exponent2: pkcs1::UIntBytes::new(&exponent2)?,
coefficient: pkcs1::UIntBytes::new(&coefficient)?,
modulus: pkcs1::UIntRef::new(&modulus)?,
public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
prime1: pkcs1::UIntRef::new(&prime1)?,
prime2: pkcs1::UIntRef::new(&prime2)?,
exponent1: pkcs1::UIntRef::new(&exponent1)?,
exponent2: pkcs1::UIntRef::new(&exponent2)?,
coefficient: pkcs1::UIntRef::new(&coefficient)?,
other_prime_infos: None,
}
.to_der()?;
.to_vec()?;

pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
}
}

impl EncodePublicKey for RsaPublicKey {
fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
let modulus = self.n().to_bytes_be();
let public_exponent = self.e().to_bytes_be();

let subject_public_key = pkcs1::RsaPublicKey {
modulus: pkcs1::UIntBytes::new(&modulus)?,
public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
modulus: pkcs1::UIntRef::new(&modulus)?,
public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
}
.to_der()?;
.to_vec()?;

pkcs8::SubjectPublicKeyInfo {
algorithm: pkcs1::ALGORITHM_ID,
Expand Down
4 changes: 2 additions & 2 deletions tests/pkcs1.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
let der = key.to_pkcs1_der().unwrap();
assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
let der = key.to_pkcs1_der().unwrap();
assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion tests/pkcs8.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
let der = key.to_pkcs8_der().unwrap();
assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
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" + '
Bump `pkcs1` => 0.4, `pkcs8` => 0.9 by sandhose · Pull Request #162 · RustCrypto/RSA · GitHub
Skip to content
Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 2 commits into

from

May 24, 2022
 Merged


Bump pkcs1 => 0.4, pkcs8 => 0.9
#162
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9437001

Bump `pkcs1` => 0.4, `pkcs8` => 0.9


sandhose May 10, 2022
b9fe224

Bump MSRV to 1.57


sandhose May 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


4 changes: 2 additions & 2 deletions
.github/workflows/ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v2
Expand Down

6 changes: 3 additions & 3 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down

6 changes: 3 additions & 3 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down

36 changes: 18 additions & 18 deletions
src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
 DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
 PublicKeyDocument,
 DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
 let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
 let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
 let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
 RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
 }
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
 fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
 fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
 // Check if the key is multi prime
 if self.primes.len() > 2 {
 return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
 );

 let private_key = pkcs1::RsaPrivateKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
 prime1: pkcs1::UIntBytes::new(&prime1)?,
 prime2: pkcs1::UIntBytes::new(&prime2)?,
 exponent1: pkcs1::UIntBytes::new(&exponent1)?,
 exponent2: pkcs1::UIntBytes::new(&exponent2)?,
 coefficient: pkcs1::UIntBytes::new(&coefficient)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
 prime1: pkcs1::UIntRef::new(&prime1)?,
 prime2: pkcs1::UIntRef::new(&prime2)?,
 exponent1: pkcs1::UIntRef::new(&exponent1)?,
 exponent2: pkcs1::UIntRef::new(&exponent2)?,
 coefficient: pkcs1::UIntRef::new(&coefficient)?,
 other_prime_infos: None,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
 }
}

impl EncodePublicKey for RsaPublicKey {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
 let modulus = self.n().to_bytes_be();
 let public_exponent = self.e().to_bytes_be();

 let subject_public_key = pkcs1::RsaPublicKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::SubjectPublicKeyInfo {
 algorithm: pkcs1::ALGORITHM_ID,
Expand Down

4 changes: 2 additions & 2 deletions
tests/pkcs1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down

2 changes: 1 addition & 1 deletion
tests/pkcs8.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs8_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
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('^' + ".*" + '
Bump `pkcs1` => 0.4, `pkcs8` => 0.9 by sandhose · Pull Request #162 · RustCrypto/RSA · GitHub
Skip to content
Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 2 commits into

from

May 24, 2022
 Merged


Bump pkcs1 => 0.4, pkcs8 => 0.9
#162
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9437001

Bump `pkcs1` => 0.4, `pkcs8` => 0.9


sandhose May 10, 2022
b9fe224

Bump MSRV to 1.57


sandhose May 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


4 changes: 2 additions & 2 deletions
.github/workflows/ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v2
Expand Down

6 changes: 3 additions & 3 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down

6 changes: 3 additions & 3 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down

36 changes: 18 additions & 18 deletions
src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
 DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
 PublicKeyDocument,
 DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
 let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
 let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
 let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
 RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
 }
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
 fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
 fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
 // Check if the key is multi prime
 if self.primes.len() > 2 {
 return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
 );

 let private_key = pkcs1::RsaPrivateKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
 prime1: pkcs1::UIntBytes::new(&prime1)?,
 prime2: pkcs1::UIntBytes::new(&prime2)?,
 exponent1: pkcs1::UIntBytes::new(&exponent1)?,
 exponent2: pkcs1::UIntBytes::new(&exponent2)?,
 coefficient: pkcs1::UIntBytes::new(&coefficient)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
 prime1: pkcs1::UIntRef::new(&prime1)?,
 prime2: pkcs1::UIntRef::new(&prime2)?,
 exponent1: pkcs1::UIntRef::new(&exponent1)?,
 exponent2: pkcs1::UIntRef::new(&exponent2)?,
 coefficient: pkcs1::UIntRef::new(&coefficient)?,
 other_prime_infos: None,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
 }
}

impl EncodePublicKey for RsaPublicKey {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
 let modulus = self.n().to_bytes_be();
 let public_exponent = self.e().to_bytes_be();

 let subject_public_key = pkcs1::RsaPublicKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::SubjectPublicKeyInfo {
 algorithm: pkcs1::ALGORITHM_ID,
Expand Down

4 changes: 2 additions & 2 deletions
tests/pkcs1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down

2 changes: 1 addition & 1 deletion
tests/pkcs8.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs8_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
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('^' + ".*" + '
Bump `pkcs1` => 0.4, `pkcs8` => 0.9 by sandhose · Pull Request #162 · RustCrypto/RSA · GitHub
Skip to content
Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 2 commits into

from

May 24, 2022
 Merged


Bump pkcs1 => 0.4, pkcs8 => 0.9
#162
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9437001

Bump `pkcs1` => 0.4, `pkcs8` => 0.9


sandhose May 10, 2022
b9fe224

Bump MSRV to 1.57


sandhose May 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


4 changes: 2 additions & 2 deletions
.github/workflows/ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v2
Expand Down

6 changes: 3 additions & 3 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down

6 changes: 3 additions & 3 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down

36 changes: 18 additions & 18 deletions
src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
 DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
 PublicKeyDocument,
 DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
 let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
 let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
 let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
 RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
 }
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
 fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
 fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
 // Check if the key is multi prime
 if self.primes.len() > 2 {
 return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
 );

 let private_key = pkcs1::RsaPrivateKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
 prime1: pkcs1::UIntBytes::new(&prime1)?,
 prime2: pkcs1::UIntBytes::new(&prime2)?,
 exponent1: pkcs1::UIntBytes::new(&exponent1)?,
 exponent2: pkcs1::UIntBytes::new(&exponent2)?,
 coefficient: pkcs1::UIntBytes::new(&coefficient)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
 prime1: pkcs1::UIntRef::new(&prime1)?,
 prime2: pkcs1::UIntRef::new(&prime2)?,
 exponent1: pkcs1::UIntRef::new(&exponent1)?,
 exponent2: pkcs1::UIntRef::new(&exponent2)?,
 coefficient: pkcs1::UIntRef::new(&coefficient)?,
 other_prime_infos: None,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
 }
}

impl EncodePublicKey for RsaPublicKey {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
 let modulus = self.n().to_bytes_be();
 let public_exponent = self.e().to_bytes_be();

 let subject_public_key = pkcs1::RsaPublicKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::SubjectPublicKeyInfo {
 algorithm: pkcs1::ALGORITHM_ID,
Expand Down

4 changes: 2 additions & 2 deletions
tests/pkcs1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down

2 changes: 1 addition & 1 deletion
tests/pkcs8.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs8_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
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" + '
Bump `pkcs1` => 0.4, `pkcs8` => 0.9 by sandhose · Pull Request #162 · RustCrypto/RSA · GitHub
Skip to content
Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 2 commits into

from

May 24, 2022
 Merged


Bump pkcs1 => 0.4, pkcs8 => 0.9
#162
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9437001

Bump `pkcs1` => 0.4, `pkcs8` => 0.9


sandhose May 10, 2022
b9fe224

Bump MSRV to 1.57


sandhose May 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


4 changes: 2 additions & 2 deletions
.github/workflows/ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v2
Expand Down

6 changes: 3 additions & 3 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down

6 changes: 3 additions & 3 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down

36 changes: 18 additions & 18 deletions
src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
 DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
 PublicKeyDocument,
 DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
 let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
 let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
 let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
 RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
 }
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
 fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
 fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
 // Check if the key is multi prime
 if self.primes.len() > 2 {
 return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
 );

 let private_key = pkcs1::RsaPrivateKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
 prime1: pkcs1::UIntBytes::new(&prime1)?,
 prime2: pkcs1::UIntBytes::new(&prime2)?,
 exponent1: pkcs1::UIntBytes::new(&exponent1)?,
 exponent2: pkcs1::UIntBytes::new(&exponent2)?,
 coefficient: pkcs1::UIntBytes::new(&coefficient)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
 prime1: pkcs1::UIntRef::new(&prime1)?,
 prime2: pkcs1::UIntRef::new(&prime2)?,
 exponent1: pkcs1::UIntRef::new(&exponent1)?,
 exponent2: pkcs1::UIntRef::new(&exponent2)?,
 coefficient: pkcs1::UIntRef::new(&coefficient)?,
 other_prime_infos: None,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
 }
}

impl EncodePublicKey for RsaPublicKey {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
 let modulus = self.n().to_bytes_be();
 let public_exponent = self.e().to_bytes_be();

 let subject_public_key = pkcs1::RsaPublicKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::SubjectPublicKeyInfo {
 algorithm: pkcs1::ALGORITHM_ID,
Expand Down

4 changes: 2 additions & 2 deletions
tests/pkcs1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down

2 changes: 1 addition & 1 deletion
tests/pkcs8.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs8_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
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('^' + ".*" + '
Bump `pkcs1` => 0.4, `pkcs8` => 0.9 by sandhose · Pull Request #162 · RustCrypto/RSA · GitHub
Skip to content
Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 2 commits into

from

May 24, 2022
 Merged


Bump pkcs1 => 0.4, pkcs8 => 0.9
#162
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9437001

Bump `pkcs1` => 0.4, `pkcs8` => 0.9


sandhose May 10, 2022
b9fe224

Bump MSRV to 1.57


sandhose May 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


4 changes: 2 additions & 2 deletions
.github/workflows/ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v2
Expand Down

6 changes: 3 additions & 3 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down

6 changes: 3 additions & 3 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down

36 changes: 18 additions & 18 deletions
src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
 DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
 PublicKeyDocument,
 DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
 let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
 let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
 let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
 RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
 }
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
 fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
 fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
 // Check if the key is multi prime
 if self.primes.len() > 2 {
 return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
 );

 let private_key = pkcs1::RsaPrivateKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
 prime1: pkcs1::UIntBytes::new(&prime1)?,
 prime2: pkcs1::UIntBytes::new(&prime2)?,
 exponent1: pkcs1::UIntBytes::new(&exponent1)?,
 exponent2: pkcs1::UIntBytes::new(&exponent2)?,
 coefficient: pkcs1::UIntBytes::new(&coefficient)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
 prime1: pkcs1::UIntRef::new(&prime1)?,
 prime2: pkcs1::UIntRef::new(&prime2)?,
 exponent1: pkcs1::UIntRef::new(&exponent1)?,
 exponent2: pkcs1::UIntRef::new(&exponent2)?,
 coefficient: pkcs1::UIntRef::new(&coefficient)?,
 other_prime_infos: None,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
 }
}

impl EncodePublicKey for RsaPublicKey {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
 let modulus = self.n().to_bytes_be();
 let public_exponent = self.e().to_bytes_be();

 let subject_public_key = pkcs1::RsaPublicKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::SubjectPublicKeyInfo {
 algorithm: pkcs1::ALGORITHM_ID,
Expand Down

4 changes: 2 additions & 2 deletions
tests/pkcs1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down

2 changes: 1 addition & 1 deletion
tests/pkcs8.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs8_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
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('^' + ".*" + '
Bump `pkcs1` => 0.4, `pkcs8` => 0.9 by sandhose · Pull Request #162 · RustCrypto/RSA · GitHub
Skip to content
Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 2 commits into

from

May 24, 2022
 Merged


Bump pkcs1 => 0.4, pkcs8 => 0.9
#162
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9437001

Bump `pkcs1` => 0.4, `pkcs8` => 0.9


sandhose May 10, 2022
b9fe224

Bump MSRV to 1.57


sandhose May 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


4 changes: 2 additions & 2 deletions
.github/workflows/ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v2
Expand Down

6 changes: 3 additions & 3 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down

6 changes: 3 additions & 3 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down

36 changes: 18 additions & 18 deletions
src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
 DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
 PublicKeyDocument,
 DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
 let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
 let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
 let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
 RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
 }
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
 fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
 fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
 // Check if the key is multi prime
 if self.primes.len() > 2 {
 return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
 );

 let private_key = pkcs1::RsaPrivateKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
 prime1: pkcs1::UIntBytes::new(&prime1)?,
 prime2: pkcs1::UIntBytes::new(&prime2)?,
 exponent1: pkcs1::UIntBytes::new(&exponent1)?,
 exponent2: pkcs1::UIntBytes::new(&exponent2)?,
 coefficient: pkcs1::UIntBytes::new(&coefficient)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
 prime1: pkcs1::UIntRef::new(&prime1)?,
 prime2: pkcs1::UIntRef::new(&prime2)?,
 exponent1: pkcs1::UIntRef::new(&exponent1)?,
 exponent2: pkcs1::UIntRef::new(&exponent2)?,
 coefficient: pkcs1::UIntRef::new(&coefficient)?,
 other_prime_infos: None,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
 }
}

impl EncodePublicKey for RsaPublicKey {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
 let modulus = self.n().to_bytes_be();
 let public_exponent = self.e().to_bytes_be();

 let subject_public_key = pkcs1::RsaPublicKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::SubjectPublicKeyInfo {
 algorithm: pkcs1::ALGORITHM_ID,
Expand Down

4 changes: 2 additions & 2 deletions
tests/pkcs1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down

2 changes: 1 addition & 1 deletion
tests/pkcs8.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs8_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
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); }
})();
})();
Bump `pkcs1` => 0.4, `pkcs8` => 0.9 by sandhose · Pull Request #162 · RustCrypto/RSA · GitHub
Skip to content
Bump pkcs1 => 0.4, pkcs8 => 0.9#162

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 2 commits into

from

May 24, 2022
 Merged


Bump pkcs1 => 0.4, pkcs8 => 0.9
#162
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
9437001

Bump `pkcs1` => 0.4, `pkcs8` => 0.9


sandhose May 10, 2022
b9fe224

Bump MSRV to 1.57


sandhose May 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


4 changes: 2 additions & 2 deletions
.github/workflows/ci.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 target:
 - thumbv7em-none-eabi
Expand All@@ -37,7 +37,7 @@ jobs:
 strategy:
 matrix:
 rust:
 - 1.56.0 # MSRV
 - 1.57.0 # MSRV
 - stable
 steps:
 - uses: actions/checkout@v2
Expand Down

6 changes: 3 additions & 3 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ repository = "https://github.com/RustCrypto/RSA"
keywords = ["rsa", "encryption", "security", "crypto"]
categories = ["cryptography"]
readme = "README.md"
rust-version = "1.56"
rust-version = "1.57"

[dependencies]
num-bigint = { version = "0.8.1", features = ["i128", "u64_digit", "prime", "zeroize"], default-features = false, package = "num-bigint-dig" }
Expand All@@ -21,8 +21,8 @@ rand_core = { version = "0.6", default-features = false }
byteorder = { version = "1.3.1", default-features = false }
subtle = { version = "2.1.1", default-features = false }
digest = { version = "0.10.0", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.3.3", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.8", default-features = false, features = ["alloc"] }
pkcs1 = { version = "0.4", default-features = false, features = ["pkcs8", "alloc"] }
pkcs8 = { version = "0.9", default-features = false, features = ["alloc"] }
zeroize = { version = "1", features = ["alloc"] }

# Temporary workaround until https://github.com/dignifiedquire/num-bigint/pull/42 lands
Expand Down

6 changes: 3 additions & 3 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
[![crates.io][crate-image]][crate-link]
[![Documentation][doc-image]][doc-link]
[![Build Status][build-image]][build-link]
![minimum rustc 1.56][msrv-image]
![minimum rustc 1.57][msrv-image]
[![Project Chat][chat-image]][chat-link]
[![dependency status][deps-image]][deps-link]

Expand DownExpand Up@@ -70,7 +70,7 @@ There will be three phases before `1.0` 🚢 can be released.

## Minimum Supported Rust Version (MSRV)

All crates in this repository support Rust 1.56 or higher. In future
All crates in this repository support Rust 1.57 or higher. In future
minimally supported version of Rust can be changed, but it will be done with
a minor version bump.

Expand All@@ -97,7 +97,7 @@ dual licensed as above, without any additional terms or conditions.
[doc-link]: https://docs.rs/rsa
[build-image]: https://github.com/rustcrypto/RSA/workflows/CI/badge.svg
[build-link]: https://github.com/RustCrypto/RSA/actions?query=workflow%3ACI+branch%3Amaster
[msrv-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[msrv-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260047-RSA
[deps-image]: https://deps.rs/repo/github/RustCrypto/RSA/status.svg
Expand Down

36 changes: 18 additions & 18 deletions
src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,9 @@

use crate::{key::PublicKeyParts, BigUint, RsaPrivateKey, RsaPublicKey};
use core::convert::{TryFrom, TryInto};
use pkcs1::der::Encode;
use pkcs8::{
 DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, PrivateKeyDocument,
 PublicKeyDocument,
 DecodePrivateKey, DecodePublicKey, Document, EncodePrivateKey, EncodePublicKey, SecretDocument,
};
use zeroize::Zeroizing;

Expand DownExpand Up@@ -56,14 +56,14 @@ impl TryFrom<pkcs8::SubjectPublicKeyInfo<'_>> for RsaPublicKey {
 let pkcs1_key = pkcs1::RsaPublicKey::try_from(spki.subject_public_key)?;
 let n = BigUint::from_bytes_be(pkcs1_key.modulus.as_bytes());
 let e = BigUint::from_bytes_be(pkcs1_key.public_exponent.as_bytes());
Ok(RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)?)
 RsaPublicKey::new(n, e).map_err(|_| pkcs8::spki::Error::KeyMalformed)
 }
}

impl DecodePublicKey for RsaPublicKey {}

impl EncodePrivateKey for RsaPrivateKey {
 fn to_pkcs8_der(&self) -> pkcs8::Result<PrivateKeyDocument> {
 fn to_pkcs8_der(&self) -> pkcs8::Result<SecretDocument> {
 // Check if the key is multi prime
 if self.primes.len() > 2 {
 return Err(pkcs1::Error::Version.into());
Expand All@@ -83,32 +83,32 @@ impl EncodePrivateKey for RsaPrivateKey {
 );

 let private_key = pkcs1::RsaPrivateKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 private_exponent: pkcs1::UIntBytes::new(&private_exponent)?,
 prime1: pkcs1::UIntBytes::new(&prime1)?,
 prime2: pkcs1::UIntBytes::new(&prime2)?,
 exponent1: pkcs1::UIntBytes::new(&exponent1)?,
 exponent2: pkcs1::UIntBytes::new(&exponent2)?,
 coefficient: pkcs1::UIntBytes::new(&coefficient)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 private_exponent: pkcs1::UIntRef::new(&private_exponent)?,
 prime1: pkcs1::UIntRef::new(&prime1)?,
 prime2: pkcs1::UIntRef::new(&prime2)?,
 exponent1: pkcs1::UIntRef::new(&exponent1)?,
 exponent2: pkcs1::UIntRef::new(&exponent2)?,
 coefficient: pkcs1::UIntRef::new(&coefficient)?,
 other_prime_infos: None,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).to_der()
 pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
 }
}

impl EncodePublicKey for RsaPublicKey {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<PublicKeyDocument> {
 fn to_public_key_der(&self) -> pkcs8::spki::Result<Document> {
 let modulus = self.n().to_bytes_be();
 let public_exponent = self.e().to_bytes_be();

 let subject_public_key = pkcs1::RsaPublicKey {
 modulus: pkcs1::UIntBytes::new(&modulus)?,
 public_exponent: pkcs1::UIntBytes::new(&public_exponent)?,
 modulus: pkcs1::UIntRef::new(&modulus)?,
 public_exponent: pkcs1::UIntRef::new(&public_exponent)?,
 }
 .to_der()?;
 .to_vec()?;

 pkcs8::SubjectPublicKeyInfo {
 algorithm: pkcs1::ALGORITHM_ID,
Expand Down

4 changes: 2 additions & 2 deletions
tests/pkcs1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,14 +90,14 @@ fn decode_rsa4096_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
fn encode_rsa4096_priv_der() {
 let key = RsaPrivateKey::from_pkcs1_der(RSA_4096_PRIV_DER).unwrap();
 let der = key.to_pkcs1_der().unwrap();
 assert_eq!(der.as_ref(), RSA_4096_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_4096_PRIV_DER)
}

#[test]
Expand Down

2 changes: 1 addition & 1 deletion
tests/pkcs8.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,7 +45,7 @@ fn decode_rsa2048_pub_der() {
fn encode_rsa2048_priv_der() {
 let key = RsaPrivateKey::from_pkcs8_der(RSA_2048_PRIV_DER).unwrap();
 let der = key.to_pkcs8_der().unwrap();
 assert_eq!(der.as_ref(), RSA_2048_PRIV_DER)
 assert_eq!(der.as_bytes(), RSA_2048_PRIV_DER)
}

#[test]
Expand Down