Key trait refactor#42

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
dignifiedquire merged 3 commits into from
Mar 6, 2020
Merged

Key trait refactor #42

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
826ea30
Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}
str4d Jan 3, 2020
ea2a3bf
Introduce key::{PrivateKey, PublicKeyParts}
str4d Jan 3, 2020
d5b4678
feat: implement From<&RSAPrivateKey> for RSAPublicKey
dignifiedquire Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/internals.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
// Blinding involves multiplying c by r^e.
// Then the decryption operation performs (m^e * r^e)^d mod n
// which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
(m * unblinder) % key.n()
}

Expand Down
137 changes: 63 additions & 74 deletions src/key.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
/// Returns the modulus of the key.
fn n(&self) -> &BigUint;
/// Returns the public exponent of the key.
fn e(&self) -> &BigUint;
/// Returns the modulus size in bytes. Raw signatures and ciphertexts for
/// or by this public key will have the same size.
fn size(&self) -> usize {
(self.n().bits() + 7) / 8
}
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
feature = "serde",
derive(Serialize, Deserialize),
serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
n: BigUint,
e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
feature = "serde",
derive(Serialize, Deserialize),
serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
/// Modulus
n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
fn from(private_key: RSAPrivateKey) -> Self {
(&private_key).into()
}
}

impl From<&RSAPrivateKey> for RSAPublicKey {
fn from(private_key: &RSAPrivateKey) -> Self {
let n = private_key.n.clone();
let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
/// Returns the modulus of the key.
fn n(&self) -> &BigUint;
/// Returns the public exponent of the key.
fn e(&self) -> &BigUint;
/// Returns the modulus size in bytes. Raw signatures and ciphertexts for
/// or by this public key will have the same size.
fn size(&self) -> usize {
(self.n().bits() + 7) / 8
}

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
/// Encrypt the given message.
fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
fn n(&self) -> &BigUint {
&self.n
}

fn e(&self) -> &BigUint {
&self.e
}
}

impl PublicKey for RSAPublicKey {
fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
match padding {
PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
/// following a `-----BEGIN RSA PUBLIC KEY-----` header.
///
/// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
///
///
/// # Example
///
///
/// ```
/// use rsa::RSAPublicKey;
///
///
/// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
/// let file_content = r#"
/// -----BEGIN RSA PUBLIC KEY-----
/// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
/// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
/// -----END RSA PUBLIC KEY-----
/// "#;
///
///
/// let der_encoded = file_content
/// .lines()
/// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
/// following a `-----BEGIN PUBLIC KEY-----` header.
///
/// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
///
///
/// # Example
///
///
/// ```
/// use rsa::RSAPublicKey;
///
///
/// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
/// let file_content = r#"
/// -----BEGIN PUBLIC KEY-----
/// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
/// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
/// -----END PUBLIC KEY-----
/// "#;
///
///
/// let der_encoded = file_content
/// .lines()
/// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
}
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
fn n(&self) -> &BigUint {
&self.n
}

fn e(&self) -> &BigUint {
&self.e
}
}

impl<'a> PublicKey for &'a RSAPublicKey {
fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
(*self).encrypt(rng, padding, msg)
}
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
}
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
fn n(&self) -> &BigUint {
&self.n
}

fn e(&self) -> &BigUint {
&self.e
}

fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
match padding {
PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
PaddingScheme::OAEP => unimplemented!("not yet implemented"),
_ => Err(Error::InvalidPaddingScheme),
}
}

fn verify<H: Hash>(
&self,
padding: PaddingScheme,
hash: Option<&H>,
hashed: &[u8],
sig: &[u8],
) -> Result<()> {
match padding {
PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
PaddingScheme::PSS => unimplemented!("not yet implemented"),
_ => Err(Error::InvalidPaddingScheme),
}
}
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
fn n(&self) -> &BigUint {
&self.n
}

fn e(&self) -> &BigUint {
&self.e
}

fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
(*self).encrypt(rng, padding, msg)
}

fn verify<H: Hash>(
&self,
padding: PaddingScheme,
hash: Option<&H>,
hashed: &[u8],
sig: &[u8],
) -> Result<()> {
(*self).verify(padding, hash, hashed, sig)
}
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
/// Generate a new RSA key pair of the given bit size using the passed in `rng`.
pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
/// following a `-----BEGIN RSA PRIVATE KEY-----` header.
///
/// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
///
///
/// # Example
///
///
/// ```
/// use rsa::RSAPrivateKey;
///
///
/// # // openssl genrsa -out tiny_key.pem 512
/// let file_content = r#"
/// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
/// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
/// -----END RSA PRIVATE KEY-----
/// "#;
///
///
/// let der_encoded = file_content
/// .lines()
/// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
/// following a `-----BEGIN PRIVATE KEY-----` header.
///
/// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
///
///
/// # Example
///
///
/// ```
/// use rsa::RSAPrivateKey;
///
///
/// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
/// let file_content = r#"
/// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
/// P7Y8fpCHy0u6
/// -----END PRIVATE KEY-----
/// "#;
///
///
/// let der_encoded = file_content
/// .lines()
/// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
if public_key.e() < &*MIN_PUB_EXPONENT {
return Err(Error::PublicExponentTooSmall);
}
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
BigUint::from_bytes_be(&n),
BigUint::from_bytes_be(&e),
BigUint::from_bytes_be(&d),
primes
.iter()
.map(|p| BigUint::from_bytes_be(p))
.collect(),
primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
);
}
}
14 changes: 8 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
Key trait refactor#42

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

dignifiedquire
merged 3 commits into

from

Mar 6, 2020
 Merged


Key trait refactor
#42
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
826ea30

Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}


str4d Jan 3, 2020
ea2a3bf

Introduce key::{PrivateKey, PublicKeyParts}


str4d Jan 3, 2020
d5b4678

feat: implement From<&RSAPrivateKey> for RSAPublicKey


dignifiedquire Mar 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
src/internals.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
 m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
 // Blinding involves multiplying c by r^e.
 // Then the decryption operation performs (m^e * r^e)^d mod n
 // which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down

137 changes: 63 additions & 74 deletions
src/key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
 static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
 static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
 n: BigUint,
 e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
 /// Modulus
 n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: RSAPrivateKey) -> Self {
 (&private_key).into()
 }
}

impl From<&RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: &RSAPrivateKey) -> Self {
 let n = private_key.n.clone();
 let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
 /// Encrypt the given message.
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
 ) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl PublicKey for RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN RSA PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
 /// let file_content = r#"
 /// -----BEGIN RSA PUBLIC KEY-----
 /// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
 /// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
 /// -----END RSA PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
 /// let file_content = r#"
 /// -----BEGIN PUBLIC KEY-----
 /// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
 /// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
 /// -----END PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
 }
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
 PaddingScheme::OAEP => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
 PaddingScheme::PSS => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 (*self).verify(padding, hash, hashed, sig)
 }
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
 /// Generate a new RSA key pair of the given bit size using the passed in `rng`.
 pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN RSA PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl genrsa -out tiny_key.pem 512
 /// let file_content = r#"
 /// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
 /// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
 /// -----END RSA PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
 /// let file_content = r#"
 /// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
 /// P7Y8fpCHy0u6
 /// -----END PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
 if public_key.e() < &*MIN_PUB_EXPONENT {
 return Err(Error::PublicExponentTooSmall);
 }
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
 BigUint::from_bytes_be(&n),
 BigUint::from_bytes_be(&e),
 BigUint::from_bytes_be(&d),
 primes
 .iter()
 .map(|p| BigUint::from_bytes_be(p))
 .collect(),
 primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
 );
 }
}

14 changes: 8 additions & 6 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading

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

Skip to content
Key trait refactor#42

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

dignifiedquire
merged 3 commits into

from

Mar 6, 2020
 Merged


Key trait refactor
#42
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
826ea30

Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}


str4d Jan 3, 2020
ea2a3bf

Introduce key::{PrivateKey, PublicKeyParts}


str4d Jan 3, 2020
d5b4678

feat: implement From<&RSAPrivateKey> for RSAPublicKey


dignifiedquire Mar 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
src/internals.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
 m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
 // Blinding involves multiplying c by r^e.
 // Then the decryption operation performs (m^e * r^e)^d mod n
 // which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down

137 changes: 63 additions & 74 deletions
src/key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
 static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
 static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
 n: BigUint,
 e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
 /// Modulus
 n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: RSAPrivateKey) -> Self {
 (&private_key).into()
 }
}

impl From<&RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: &RSAPrivateKey) -> Self {
 let n = private_key.n.clone();
 let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
 /// Encrypt the given message.
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
 ) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl PublicKey for RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN RSA PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
 /// let file_content = r#"
 /// -----BEGIN RSA PUBLIC KEY-----
 /// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
 /// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
 /// -----END RSA PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
 /// let file_content = r#"
 /// -----BEGIN PUBLIC KEY-----
 /// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
 /// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
 /// -----END PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
 }
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
 PaddingScheme::OAEP => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
 PaddingScheme::PSS => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 (*self).verify(padding, hash, hashed, sig)
 }
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
 /// Generate a new RSA key pair of the given bit size using the passed in `rng`.
 pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN RSA PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl genrsa -out tiny_key.pem 512
 /// let file_content = r#"
 /// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
 /// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
 /// -----END RSA PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
 /// let file_content = r#"
 /// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
 /// P7Y8fpCHy0u6
 /// -----END PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
 if public_key.e() < &*MIN_PUB_EXPONENT {
 return Err(Error::PublicExponentTooSmall);
 }
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
 BigUint::from_bytes_be(&n),
 BigUint::from_bytes_be(&e),
 BigUint::from_bytes_be(&d),
 primes
 .iter()
 .map(|p| BigUint::from_bytes_be(p))
 .collect(),
 primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
 );
 }
}

14 changes: 8 additions & 6 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading

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

Skip to content
Key trait refactor#42

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

dignifiedquire
merged 3 commits into

from

Mar 6, 2020
 Merged


Key trait refactor
#42
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
826ea30

Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}


str4d Jan 3, 2020
ea2a3bf

Introduce key::{PrivateKey, PublicKeyParts}


str4d Jan 3, 2020
d5b4678

feat: implement From<&RSAPrivateKey> for RSAPublicKey


dignifiedquire Mar 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
src/internals.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
 m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
 // Blinding involves multiplying c by r^e.
 // Then the decryption operation performs (m^e * r^e)^d mod n
 // which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down

137 changes: 63 additions & 74 deletions
src/key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
 static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
 static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
 n: BigUint,
 e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
 /// Modulus
 n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: RSAPrivateKey) -> Self {
 (&private_key).into()
 }
}

impl From<&RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: &RSAPrivateKey) -> Self {
 let n = private_key.n.clone();
 let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
 /// Encrypt the given message.
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
 ) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl PublicKey for RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN RSA PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
 /// let file_content = r#"
 /// -----BEGIN RSA PUBLIC KEY-----
 /// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
 /// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
 /// -----END RSA PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
 /// let file_content = r#"
 /// -----BEGIN PUBLIC KEY-----
 /// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
 /// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
 /// -----END PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
 }
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
 PaddingScheme::OAEP => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
 PaddingScheme::PSS => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 (*self).verify(padding, hash, hashed, sig)
 }
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
 /// Generate a new RSA key pair of the given bit size using the passed in `rng`.
 pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN RSA PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl genrsa -out tiny_key.pem 512
 /// let file_content = r#"
 /// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
 /// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
 /// -----END RSA PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
 /// let file_content = r#"
 /// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
 /// P7Y8fpCHy0u6
 /// -----END PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
 if public_key.e() < &*MIN_PUB_EXPONENT {
 return Err(Error::PublicExponentTooSmall);
 }
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
 BigUint::from_bytes_be(&n),
 BigUint::from_bytes_be(&e),
 BigUint::from_bytes_be(&d),
 primes
 .iter()
 .map(|p| BigUint::from_bytes_be(p))
 .collect(),
 primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
 );
 }
}

14 changes: 8 additions & 6 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
Key trait refactor#42

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

dignifiedquire
merged 3 commits into

from

Mar 6, 2020
 Merged


Key trait refactor
#42
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
826ea30

Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}


str4d Jan 3, 2020
ea2a3bf

Introduce key::{PrivateKey, PublicKeyParts}


str4d Jan 3, 2020
d5b4678

feat: implement From<&RSAPrivateKey> for RSAPublicKey


dignifiedquire Mar 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
src/internals.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
 m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
 // Blinding involves multiplying c by r^e.
 // Then the decryption operation performs (m^e * r^e)^d mod n
 // which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down

137 changes: 63 additions & 74 deletions
src/key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
 static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
 static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
 n: BigUint,
 e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
 /// Modulus
 n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: RSAPrivateKey) -> Self {
 (&private_key).into()
 }
}

impl From<&RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: &RSAPrivateKey) -> Self {
 let n = private_key.n.clone();
 let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
 /// Encrypt the given message.
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
 ) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl PublicKey for RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN RSA PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
 /// let file_content = r#"
 /// -----BEGIN RSA PUBLIC KEY-----
 /// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
 /// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
 /// -----END RSA PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
 /// let file_content = r#"
 /// -----BEGIN PUBLIC KEY-----
 /// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
 /// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
 /// -----END PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
 }
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
 PaddingScheme::OAEP => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
 PaddingScheme::PSS => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 (*self).verify(padding, hash, hashed, sig)
 }
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
 /// Generate a new RSA key pair of the given bit size using the passed in `rng`.
 pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN RSA PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl genrsa -out tiny_key.pem 512
 /// let file_content = r#"
 /// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
 /// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
 /// -----END RSA PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
 /// let file_content = r#"
 /// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
 /// P7Y8fpCHy0u6
 /// -----END PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
 if public_key.e() < &*MIN_PUB_EXPONENT {
 return Err(Error::PublicExponentTooSmall);
 }
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
 BigUint::from_bytes_be(&n),
 BigUint::from_bytes_be(&e),
 BigUint::from_bytes_be(&d),
 primes
 .iter()
 .map(|p| BigUint::from_bytes_be(p))
 .collect(),
 primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
 );
 }
}

14 changes: 8 additions & 6 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading

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

Skip to content
Key trait refactor#42

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

dignifiedquire
merged 3 commits into

from

Mar 6, 2020
 Merged


Key trait refactor
#42
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
826ea30

Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}


str4d Jan 3, 2020
ea2a3bf

Introduce key::{PrivateKey, PublicKeyParts}


str4d Jan 3, 2020
d5b4678

feat: implement From<&RSAPrivateKey> for RSAPublicKey


dignifiedquire Mar 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
src/internals.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
 m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
 // Blinding involves multiplying c by r^e.
 // Then the decryption operation performs (m^e * r^e)^d mod n
 // which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down

137 changes: 63 additions & 74 deletions
src/key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
 static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
 static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
 n: BigUint,
 e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
 /// Modulus
 n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: RSAPrivateKey) -> Self {
 (&private_key).into()
 }
}

impl From<&RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: &RSAPrivateKey) -> Self {
 let n = private_key.n.clone();
 let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
 /// Encrypt the given message.
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
 ) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl PublicKey for RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN RSA PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
 /// let file_content = r#"
 /// -----BEGIN RSA PUBLIC KEY-----
 /// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
 /// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
 /// -----END RSA PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
 /// let file_content = r#"
 /// -----BEGIN PUBLIC KEY-----
 /// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
 /// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
 /// -----END PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
 }
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
 PaddingScheme::OAEP => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
 PaddingScheme::PSS => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 (*self).verify(padding, hash, hashed, sig)
 }
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
 /// Generate a new RSA key pair of the given bit size using the passed in `rng`.
 pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN RSA PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl genrsa -out tiny_key.pem 512
 /// let file_content = r#"
 /// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
 /// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
 /// -----END RSA PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
 /// let file_content = r#"
 /// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
 /// P7Y8fpCHy0u6
 /// -----END PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
 if public_key.e() < &*MIN_PUB_EXPONENT {
 return Err(Error::PublicExponentTooSmall);
 }
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
 BigUint::from_bytes_be(&n),
 BigUint::from_bytes_be(&e),
 BigUint::from_bytes_be(&d),
 primes
 .iter()
 .map(|p| BigUint::from_bytes_be(p))
 .collect(),
 primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
 );
 }
}

14 changes: 8 additions & 6 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Key trait refactor#42

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

dignifiedquire
merged 3 commits into

from

Mar 6, 2020
 Merged


Key trait refactor
#42
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
826ea30

Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}


str4d Jan 3, 2020
ea2a3bf

Introduce key::{PrivateKey, PublicKeyParts}


str4d Jan 3, 2020
d5b4678

feat: implement From<&RSAPrivateKey> for RSAPublicKey


dignifiedquire Mar 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
src/internals.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
 m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
 // Blinding involves multiplying c by r^e.
 // Then the decryption operation performs (m^e * r^e)^d mod n
 // which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down

137 changes: 63 additions & 74 deletions
src/key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
 static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
 static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
 n: BigUint,
 e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
 /// Modulus
 n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: RSAPrivateKey) -> Self {
 (&private_key).into()
 }
}

impl From<&RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: &RSAPrivateKey) -> Self {
 let n = private_key.n.clone();
 let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
 /// Encrypt the given message.
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
 ) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl PublicKey for RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN RSA PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
 /// let file_content = r#"
 /// -----BEGIN RSA PUBLIC KEY-----
 /// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
 /// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
 /// -----END RSA PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
 /// let file_content = r#"
 /// -----BEGIN PUBLIC KEY-----
 /// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
 /// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
 /// -----END PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
 }
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
 PaddingScheme::OAEP => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
 PaddingScheme::PSS => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 (*self).verify(padding, hash, hashed, sig)
 }
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
 /// Generate a new RSA key pair of the given bit size using the passed in `rng`.
 pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN RSA PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl genrsa -out tiny_key.pem 512
 /// let file_content = r#"
 /// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
 /// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
 /// -----END RSA PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
 /// let file_content = r#"
 /// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
 /// P7Y8fpCHy0u6
 /// -----END PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
 if public_key.e() < &*MIN_PUB_EXPONENT {
 return Err(Error::PublicExponentTooSmall);
 }
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
 BigUint::from_bytes_be(&n),
 BigUint::from_bytes_be(&e),
 BigUint::from_bytes_be(&d),
 primes
 .iter()
 .map(|p| BigUint::from_bytes_be(p))
 .collect(),
 primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
 );
 }
}

14 changes: 8 additions & 6 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading

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

Skip to content
Key trait refactor#42

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

dignifiedquire
merged 3 commits into

from

Mar 6, 2020
 Merged


Key trait refactor
#42
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
826ea30

Introduce raw::{DecryptionPrimitive, EncryptionPrimitive}


str4d Jan 3, 2020
ea2a3bf

Introduce key::{PrivateKey, PublicKeyParts}


str4d Jan 3, 2020
d5b4678

feat: implement From<&RSAPrivateKey> for RSAPublicKey


dignifiedquire Mar 6, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
src/internals.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,11 @@ use std::borrow::Cow;
use zeroize::Zeroize;

use crate::errors::{Error, Result};
use crate::key::{PublicKey, RSAPrivateKey};
use crate::key::{PublicKeyParts, RSAPrivateKey};

/// Raw RSA encryption of m with the public key. No padding is performed.
#[inline]
pub fn encrypt<K: PublicKey>(key: &K, m: &BigUint) -> BigUint {
pub fn encrypt<K: PublicKeyParts>(key: &K, m: &BigUint) -> BigUint {
 m.modpow(key.e(), key.n())
}

Expand DownExpand Up@@ -125,7 +125,7 @@ pub fn decrypt_and_check<R: Rng>(
}

/// Returns the blinded c, along with the unblinding factor.
pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
pub fn blind<R: Rng, K: PublicKeyParts>(rng: &mut R, key: &K, c: &BigUint) -> (BigUint, BigUint) {
 // Blinding involves multiplying c by r^e.
 // Then the decryption operation performs (m^e * r^e)^d mod n
 // which equals mr mod n. The factor of r can then be removed
Expand DownExpand Up@@ -162,7 +162,7 @@ pub fn blind<R: Rng, K: PublicKey>(rng: &mut R, key: &K, c: &BigUint) -> (BigUin
}

/// Given an m and and unblinding factor, unblind the m.
pub fn unblind(key: impl PublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
pub fn unblind(key: impl PublicKeyParts, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down

137 changes: 63 additions & 74 deletions
src/key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,23 +12,46 @@ use crate::errors::{Error, Result};
use crate::hash::Hash;
use crate::padding::PaddingScheme;
use crate::pkcs1v15;
use crate::raw::{DecryptionPrimitive, EncryptionPrimitive};

lazy_static! {
 static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap();
 static ref MAX_PUB_EXPONENT: BigUint = BigUint::from_u64(1 << (31 - 1)).unwrap();
}

pub trait PublicKeyParts {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }
}

pub trait PrivateKey: DecryptionPrimitive + PublicKeyParts {}

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPublicKey {
 n: BigUint,
 e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
#[cfg_attr(
 feature = "serde",
 derive(Serialize, Deserialize),
 serde(crate = "serde_crate")
)]
pub struct RSAPrivateKey {
 /// Modulus
 n: BigUint,
Expand DownExpand Up@@ -118,6 +141,12 @@ pub(crate) struct CRTValue {

impl From<RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: RSAPrivateKey) -> Self {
 (&private_key).into()
 }
}

impl From<&RSAPrivateKey> for RSAPublicKey {
 fn from(private_key: &RSAPrivateKey) -> Self {
 let n = private_key.n.clone();
 let e = private_key.e.clone();

Expand All@@ -126,17 +155,7 @@ impl From<RSAPrivateKey> for RSAPublicKey {
}

/// Generic trait for operations on a public key.
pub trait PublicKey {
 /// Returns the modulus of the key.
 fn n(&self) -> &BigUint;
 /// Returns the public exponent of the key.
 fn e(&self) -> &BigUint;
 /// Returns the modulus size in bytes. Raw signatures and ciphertexts for
 /// or by this public key will have the same size.
 fn size(&self) -> usize {
 (self.n().bits() + 7) / 8
 }

pub trait PublicKey: EncryptionPrimitive + PublicKeyParts {
 /// Encrypt the given message.
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>>;

Expand All@@ -153,14 +172,17 @@ pub trait PublicKey {
 ) -> Result<()>;
}

impl PublicKey for RSAPublicKey {
impl PublicKeyParts for RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl PublicKey for RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
Expand DownExpand Up@@ -199,20 +221,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN RSA PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -pubin -in tiny_key.pub.pem -RSAPublicKey_out
 /// let file_content = r#"
 /// -----BEGIN RSA PUBLIC KEY-----
 /// MEgCQQCuWe45NapeQ6rkb5T5hYMgQwr3T0NE9rItqDwFJjcNmf6m9kq/wRAaFqWo
 /// BX/BpdSuD0YqSUrnQ5ejf1XW9gmJAgMBAAE=
 /// -----END RSA PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -233,20 +255,20 @@ impl RSAPublicKey {
 /// following a `-----BEGIN PUBLIC KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPublicKey;
 ///
 ///
 /// # // openssl rsa -in tiny_key.pem -outform PEM -pubout -out tiny_key.pub.pem
 /// let file_content = r#"
 /// -----BEGIN PUBLIC KEY-----
 /// MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAK5Z7jk1ql5DquRvlPmFgyBDCvdPQ0T2
 /// si2oPAUmNw2Z/qb2Sr/BEBoWpagFf8Gl1K4PRipJSudDl6N/Vdb2CYkCAwEAAQ==
 /// -----END PUBLIC KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -262,15 +284,17 @@ impl RSAPublicKey {
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
impl<'a> PublicKeyParts for &'a RSAPublicKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }
}

impl<'a> PublicKey for &'a RSAPublicKey {
 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }
Expand All@@ -286,62 +310,30 @@ impl<'a> PublicKey for &'a RSAPublicKey {
 }
}

impl PublicKey for RSAPrivateKey {
impl PublicKeyParts for RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::encrypt(rng, self, msg),
 PaddingScheme::OAEP => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 match padding {
 PaddingScheme::PKCS1v15 => pkcs1v15::verify(self, hash, hashed, sig),
 PaddingScheme::PSS => unimplemented!("not yet implemented"),
 _ => Err(Error::InvalidPaddingScheme),
 }
 }
}

impl<'a> PublicKey for &'a RSAPrivateKey {
impl PrivateKey for RSAPrivateKey {}

impl<'a> PublicKeyParts for &'a RSAPrivateKey {
 fn n(&self) -> &BigUint {
 &self.n
 }

 fn e(&self) -> &BigUint {
 &self.e
 }

 fn encrypt<R: Rng>(&self, rng: &mut R, padding: PaddingScheme, msg: &[u8]) -> Result<Vec<u8>> {
 (*self).encrypt(rng, padding, msg)
 }

 fn verify<H: Hash>(
 &self,
 padding: PaddingScheme,
 hash: Option<&H>,
 hashed: &[u8],
 sig: &[u8],
 ) -> Result<()> {
 (*self).verify(padding, hash, hashed, sig)
 }
}

impl<'a> PrivateKey for &'a RSAPrivateKey {}

impl RSAPrivateKey {
 /// Generate a new RSA key pair of the given bit size using the passed in `rng`.
 pub fn new<R: Rng>(rng: &mut R, bit_size: usize) -> Result<RSAPrivateKey> {
Expand DownExpand Up@@ -375,12 +367,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN RSA PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl genrsa -out tiny_key.pem 512
 /// let file_content = r#"
 /// -----BEGIN RSA PRIVATE KEY-----
Expand All@@ -393,7 +385,7 @@ impl RSAPrivateKey {
 /// JdwDGF7Kanex70KAacmOlw3vfx6XWT+2PH6Qh8tLug==
 /// -----END RSA PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand All@@ -414,12 +406,12 @@ impl RSAPrivateKey {
 /// following a `-----BEGIN PRIVATE KEY-----` header.
 ///
 /// <https://tls.mbed.org/kb/cryptography/asn1-key-structures-in-der-and-pem>
 ///
 ///
 /// # Example
 ///
 ///
 /// ```
 /// use rsa::RSAPrivateKey;
 ///
 ///
 /// # // openssl pkcs8 -topk8 -inform PEM -outform PEM -in tiny_key.pem -out tiny_key.pkcs8.pem -nocrypt
 /// let file_content = r#"
 /// -----BEGIN PRIVATE KEY-----
Expand All@@ -433,7 +425,7 @@ impl RSAPrivateKey {
 /// P7Y8fpCHy0u6
 /// -----END PRIVATE KEY-----
 /// "#;
 ///
 ///
 /// let der_encoded = file_content
 /// .lines()
 /// .filter(|line| !line.starts_with("-"))
Expand DownExpand Up@@ -606,7 +598,7 @@ impl RSAPrivateKey {

/// Check that the public key is well formed and has an exponent within acceptable bounds.
#[inline]
pub fn check_public(public_key: &impl PublicKey) -> Result<()> {
pub fn check_public(public_key: &impl PublicKeyParts) -> Result<()> {
 if public_key.e() < &*MIN_PUB_EXPONENT {
 return Err(Error::PublicExponentTooSmall);
 }
Expand DownExpand Up@@ -802,10 +794,7 @@ mod tests {
 BigUint::from_bytes_be(&n),
 BigUint::from_bytes_be(&e),
 BigUint::from_bytes_be(&d),
 primes
 .iter()
 .map(|p| BigUint::from_bytes_be(p))
 .collect(),
 primes.iter().map(|p| BigUint::from_bytes_be(p)).collect(),
 );
 }
}

14 changes: 8 additions & 6 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,20 +8,21 @@
//! extern crate rsa;
//! extern crate rand;
//!
//! use rsa::{PublicKey, RSAPrivateKey, PaddingScheme};
//! use rsa::{PublicKey, RSAPrivateKey, RSAPublicKey, PaddingScheme};
//! use rand::rngs::OsRng;
//!
//! let mut rng = OsRng;
//! let bits = 2048;
//! let key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let private_key = RSAPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
//! let public_key = RSAPublicKey::from(&private_key);
//!
//! // Encrypt
//! let data = b"hello world";
//! let enc_data = key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! let enc_data = public_key.encrypt(&mut rng, PaddingScheme::PKCS1v15, &data[..]).expect("failed to encrypt");
//! assert_ne!(&data[..], &enc_data[..]);
//!
//! // Decrypt
//! let dec_data = key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! let dec_data = private_key.decrypt(PaddingScheme::PKCS1v15, &enc_data).expect("failed to decrypt");
//! assert_eq!(&data[..], &dec_data[..]);
//! ```
//!
Expand DownExpand Up@@ -58,12 +59,13 @@ pub mod hash;
/// Supported padding schemes.
pub mod padding;

#[cfg(feature="pem")]
#[cfg(feature = "pem")]
pub use pem;

mod key;
mod pkcs1v15;
mod parse;
mod pkcs1v15;
mod raw;

pub use self::key::{PublicKey, RSAPrivateKey, RSAPublicKey};
pub use self::padding::PaddingScheme;
Expand Down
Loading