Implement PSS#26

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
roblabla wants to merge 7 commits into from
Closed

Implement PSS #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d28baf
Implement PSS
roblabla Aug 21, 2019
2462f1d
Remove PublicKey trait, use deref.
roblabla Sep 26, 2019
071f07f
Avoid using vectors to store the asn1 prefixes
roblabla Sep 26, 2019
527acfc
Use separate functions for different padding schemes
roblabla Sep 26, 2019
b821cc6
Add new sign_pss/verify_pss
roblabla Sep 26, 2019
30220cf
Fix the tests
roblabla Sep 26, 2019
610c4cc
Move copy_with_left_pad to algorithms
roblabla Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down
10 changes: 10 additions & 0 deletions src/algorithms.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
primes,
))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
// left pad with zeros
let padding_bytes = dest.len() - src.len();
for el in dest.iter_mut().take(padding_bytes) {
*el = 0;
}
dest[padding_bytes..].copy_from_slice(src);
}
26 changes: 13 additions & 13 deletions src/hash.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
fn size(&self) -> usize;

/// Returns the ASN1 DER prefix for the the hash function.
fn asn1_prefix(&self) -> Vec<u8>;
fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
}
}

fn asn1_prefix(&self) -> Vec<u8> {
fn asn1_prefix(&self) -> &'static [u8] {
match *self {
Hashes::MD5 => vec![
Hashes::MD5 => &[
0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
0x05, 0x00, 0x04, 0x10,
],
Hashes::SHA1 => vec![
Hashes::SHA1 => &[
0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
0x14,
],
Hashes::SHA2_224 => vec![
Hashes::SHA2_224 => &[
0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
0x04, 0x05, 0x00, 0x04, 0x1c,
],
Hashes::SHA2_256 => vec![
Hashes::SHA2_256 => &[
0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
0x01, 0x05, 0x00, 0x04, 0x20,
],
Hashes::SHA2_384 => vec![
Hashes::SHA2_384 => &[
0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
0x02, 0x05, 0x00, 0x04, 0x30,
],

Hashes::SHA2_512 => vec![
Hashes::SHA2_512 => &[
0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
0x03, 0x05, 0x00, 0x04, 0x40,
],

// A special TLS case which doesn't use an ASN1 prefix
Hashes::MD5SHA1 => Vec::new(),
Hashes::RIPEMD160 => vec![
Hashes::MD5SHA1 => &[],
Hashes::RIPEMD160 => &[
0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
],

Hashes::SHA3_256 => vec![
Hashes::SHA3_256 => &[
0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
0x08, 0x05, 0x00, 0x04, 0x20,
],
Hashes::SHA3_384 => vec![
Hashes::SHA3_384 => &[
30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
0x08, 0x05, 0x00, 0x04, 0x20,
],

Hashes::SHA3_512 => vec![
Hashes::SHA3_512 => &[
0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
0x0a, 0x05, 0x00, 0x04, 0x40,
],
Expand Down
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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
(m * unblinder) % key.n()
}

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
Implement PSS#26

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

roblabla
wants to merge
7
commits into

from

 Closed


Implement PSS
#26
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
5d28baf

Implement PSS


roblabla Aug 21, 2019
2462f1d

Remove PublicKey trait, use deref.


roblabla Sep 26, 2019
071f07f

Avoid using vectors to store the asn1 prefixes


roblabla Sep 26, 2019
527acfc

Use separate functions for different padding schemes


roblabla Sep 26, 2019
b821cc6

Add new sign_pss/verify_pss


roblabla Sep 26, 2019
30220cf

Fix the tests


roblabla Sep 26, 2019
610c4cc

Move copy_with_left_pad to algorithms


roblabla Sep 26, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down

10 changes: 10 additions & 0 deletions
src/algorithms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
 primes,
 ))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
 // left pad with zeros
 let padding_bytes = dest.len() - src.len();
 for el in dest.iter_mut().take(padding_bytes) {
 *el = 0;
 }
 dest[padding_bytes..].copy_from_slice(src);
}

26 changes: 13 additions & 13 deletions
src/hash.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
 fn size(&self) -> usize;

 /// Returns the ASN1 DER prefix for the the hash function.
 fn asn1_prefix(&self) -> Vec<u8>;
 fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
 }
 }

 fn asn1_prefix(&self) -> Vec<u8> {
 fn asn1_prefix(&self) -> &'static [u8] {
 match *self {
 Hashes::MD5 => vec![
 Hashes::MD5 => &[
 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
 0x05, 0x00, 0x04, 0x10,
 ],
 Hashes::SHA1 => vec![
 Hashes::SHA1 => &[
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
 0x14,
 ],
 Hashes::SHA2_224 => vec![
 Hashes::SHA2_224 => &[
 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x04, 0x05, 0x00, 0x04, 0x1c,
 ],
 Hashes::SHA2_256 => vec![
 Hashes::SHA2_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA2_384 => vec![
 Hashes::SHA2_384 => &[
 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x02, 0x05, 0x00, 0x04, 0x30,
 ],

 Hashes::SHA2_512 => vec![
 Hashes::SHA2_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x03, 0x05, 0x00, 0x04, 0x40,
 ],

 // A special TLS case which doesn't use an ASN1 prefix
 Hashes::MD5SHA1 => Vec::new(),
 Hashes::RIPEMD160 => vec![
 Hashes::MD5SHA1 => &[],
 Hashes::RIPEMD160 => &[
 0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
 ],

 Hashes::SHA3_256 => vec![
 Hashes::SHA3_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA3_384 => vec![
 Hashes::SHA3_384 => &[
 30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],

 Hashes::SHA3_512 => vec![
 Hashes::SHA3_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x0a, 0x05, 0x00, 0x04, 0x40,
 ],
Expand Down

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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

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
Implement PSS#26

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

roblabla
wants to merge
7
commits into

from

 Closed


Implement PSS
#26
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
5d28baf

Implement PSS


roblabla Aug 21, 2019
2462f1d

Remove PublicKey trait, use deref.


roblabla Sep 26, 2019
071f07f

Avoid using vectors to store the asn1 prefixes


roblabla Sep 26, 2019
527acfc

Use separate functions for different padding schemes


roblabla Sep 26, 2019
b821cc6

Add new sign_pss/verify_pss


roblabla Sep 26, 2019
30220cf

Fix the tests


roblabla Sep 26, 2019
610c4cc

Move copy_with_left_pad to algorithms


roblabla Sep 26, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down

10 changes: 10 additions & 0 deletions
src/algorithms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
 primes,
 ))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
 // left pad with zeros
 let padding_bytes = dest.len() - src.len();
 for el in dest.iter_mut().take(padding_bytes) {
 *el = 0;
 }
 dest[padding_bytes..].copy_from_slice(src);
}

26 changes: 13 additions & 13 deletions
src/hash.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
 fn size(&self) -> usize;

 /// Returns the ASN1 DER prefix for the the hash function.
 fn asn1_prefix(&self) -> Vec<u8>;
 fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
 }
 }

 fn asn1_prefix(&self) -> Vec<u8> {
 fn asn1_prefix(&self) -> &'static [u8] {
 match *self {
 Hashes::MD5 => vec![
 Hashes::MD5 => &[
 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
 0x05, 0x00, 0x04, 0x10,
 ],
 Hashes::SHA1 => vec![
 Hashes::SHA1 => &[
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
 0x14,
 ],
 Hashes::SHA2_224 => vec![
 Hashes::SHA2_224 => &[
 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x04, 0x05, 0x00, 0x04, 0x1c,
 ],
 Hashes::SHA2_256 => vec![
 Hashes::SHA2_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA2_384 => vec![
 Hashes::SHA2_384 => &[
 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x02, 0x05, 0x00, 0x04, 0x30,
 ],

 Hashes::SHA2_512 => vec![
 Hashes::SHA2_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x03, 0x05, 0x00, 0x04, 0x40,
 ],

 // A special TLS case which doesn't use an ASN1 prefix
 Hashes::MD5SHA1 => Vec::new(),
 Hashes::RIPEMD160 => vec![
 Hashes::MD5SHA1 => &[],
 Hashes::RIPEMD160 => &[
 0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
 ],

 Hashes::SHA3_256 => vec![
 Hashes::SHA3_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA3_384 => vec![
 Hashes::SHA3_384 => &[
 30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],

 Hashes::SHA3_512 => vec![
 Hashes::SHA3_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x0a, 0x05, 0x00, 0x04, 0x40,
 ],
Expand Down

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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

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
Implement PSS#26

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

roblabla
wants to merge
7
commits into

from

 Closed


Implement PSS
#26
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
5d28baf

Implement PSS


roblabla Aug 21, 2019
2462f1d

Remove PublicKey trait, use deref.


roblabla Sep 26, 2019
071f07f

Avoid using vectors to store the asn1 prefixes


roblabla Sep 26, 2019
527acfc

Use separate functions for different padding schemes


roblabla Sep 26, 2019
b821cc6

Add new sign_pss/verify_pss


roblabla Sep 26, 2019
30220cf

Fix the tests


roblabla Sep 26, 2019
610c4cc

Move copy_with_left_pad to algorithms


roblabla Sep 26, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down

10 changes: 10 additions & 0 deletions
src/algorithms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
 primes,
 ))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
 // left pad with zeros
 let padding_bytes = dest.len() - src.len();
 for el in dest.iter_mut().take(padding_bytes) {
 *el = 0;
 }
 dest[padding_bytes..].copy_from_slice(src);
}

26 changes: 13 additions & 13 deletions
src/hash.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
 fn size(&self) -> usize;

 /// Returns the ASN1 DER prefix for the the hash function.
 fn asn1_prefix(&self) -> Vec<u8>;
 fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
 }
 }

 fn asn1_prefix(&self) -> Vec<u8> {
 fn asn1_prefix(&self) -> &'static [u8] {
 match *self {
 Hashes::MD5 => vec![
 Hashes::MD5 => &[
 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
 0x05, 0x00, 0x04, 0x10,
 ],
 Hashes::SHA1 => vec![
 Hashes::SHA1 => &[
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
 0x14,
 ],
 Hashes::SHA2_224 => vec![
 Hashes::SHA2_224 => &[
 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x04, 0x05, 0x00, 0x04, 0x1c,
 ],
 Hashes::SHA2_256 => vec![
 Hashes::SHA2_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA2_384 => vec![
 Hashes::SHA2_384 => &[
 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x02, 0x05, 0x00, 0x04, 0x30,
 ],

 Hashes::SHA2_512 => vec![
 Hashes::SHA2_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x03, 0x05, 0x00, 0x04, 0x40,
 ],

 // A special TLS case which doesn't use an ASN1 prefix
 Hashes::MD5SHA1 => Vec::new(),
 Hashes::RIPEMD160 => vec![
 Hashes::MD5SHA1 => &[],
 Hashes::RIPEMD160 => &[
 0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
 ],

 Hashes::SHA3_256 => vec![
 Hashes::SHA3_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA3_384 => vec![
 Hashes::SHA3_384 => &[
 30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],

 Hashes::SHA3_512 => vec![
 Hashes::SHA3_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x0a, 0x05, 0x00, 0x04, 0x40,
 ],
Expand Down

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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

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
Implement PSS#26

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

roblabla
wants to merge
7
commits into

from

 Closed


Implement PSS
#26
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
5d28baf

Implement PSS


roblabla Aug 21, 2019
2462f1d

Remove PublicKey trait, use deref.


roblabla Sep 26, 2019
071f07f

Avoid using vectors to store the asn1 prefixes


roblabla Sep 26, 2019
527acfc

Use separate functions for different padding schemes


roblabla Sep 26, 2019
b821cc6

Add new sign_pss/verify_pss


roblabla Sep 26, 2019
30220cf

Fix the tests


roblabla Sep 26, 2019
610c4cc

Move copy_with_left_pad to algorithms


roblabla Sep 26, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down

10 changes: 10 additions & 0 deletions
src/algorithms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
 primes,
 ))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
 // left pad with zeros
 let padding_bytes = dest.len() - src.len();
 for el in dest.iter_mut().take(padding_bytes) {
 *el = 0;
 }
 dest[padding_bytes..].copy_from_slice(src);
}

26 changes: 13 additions & 13 deletions
src/hash.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
 fn size(&self) -> usize;

 /// Returns the ASN1 DER prefix for the the hash function.
 fn asn1_prefix(&self) -> Vec<u8>;
 fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
 }
 }

 fn asn1_prefix(&self) -> Vec<u8> {
 fn asn1_prefix(&self) -> &'static [u8] {
 match *self {
 Hashes::MD5 => vec![
 Hashes::MD5 => &[
 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
 0x05, 0x00, 0x04, 0x10,
 ],
 Hashes::SHA1 => vec![
 Hashes::SHA1 => &[
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
 0x14,
 ],
 Hashes::SHA2_224 => vec![
 Hashes::SHA2_224 => &[
 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x04, 0x05, 0x00, 0x04, 0x1c,
 ],
 Hashes::SHA2_256 => vec![
 Hashes::SHA2_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA2_384 => vec![
 Hashes::SHA2_384 => &[
 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x02, 0x05, 0x00, 0x04, 0x30,
 ],

 Hashes::SHA2_512 => vec![
 Hashes::SHA2_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x03, 0x05, 0x00, 0x04, 0x40,
 ],

 // A special TLS case which doesn't use an ASN1 prefix
 Hashes::MD5SHA1 => Vec::new(),
 Hashes::RIPEMD160 => vec![
 Hashes::MD5SHA1 => &[],
 Hashes::RIPEMD160 => &[
 0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
 ],

 Hashes::SHA3_256 => vec![
 Hashes::SHA3_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA3_384 => vec![
 Hashes::SHA3_384 => &[
 30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],

 Hashes::SHA3_512 => vec![
 Hashes::SHA3_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x0a, 0x05, 0x00, 0x04, 0x40,
 ],
Expand Down

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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

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
Implement PSS#26

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

roblabla
wants to merge
7
commits into

from

 Closed


Implement PSS
#26
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
5d28baf

Implement PSS


roblabla Aug 21, 2019
2462f1d

Remove PublicKey trait, use deref.


roblabla Sep 26, 2019
071f07f

Avoid using vectors to store the asn1 prefixes


roblabla Sep 26, 2019
527acfc

Use separate functions for different padding schemes


roblabla Sep 26, 2019
b821cc6

Add new sign_pss/verify_pss


roblabla Sep 26, 2019
30220cf

Fix the tests


roblabla Sep 26, 2019
610c4cc

Move copy_with_left_pad to algorithms


roblabla Sep 26, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down

10 changes: 10 additions & 0 deletions
src/algorithms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
 primes,
 ))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
 // left pad with zeros
 let padding_bytes = dest.len() - src.len();
 for el in dest.iter_mut().take(padding_bytes) {
 *el = 0;
 }
 dest[padding_bytes..].copy_from_slice(src);
}

26 changes: 13 additions & 13 deletions
src/hash.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
 fn size(&self) -> usize;

 /// Returns the ASN1 DER prefix for the the hash function.
 fn asn1_prefix(&self) -> Vec<u8>;
 fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
 }
 }

 fn asn1_prefix(&self) -> Vec<u8> {
 fn asn1_prefix(&self) -> &'static [u8] {
 match *self {
 Hashes::MD5 => vec![
 Hashes::MD5 => &[
 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
 0x05, 0x00, 0x04, 0x10,
 ],
 Hashes::SHA1 => vec![
 Hashes::SHA1 => &[
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
 0x14,
 ],
 Hashes::SHA2_224 => vec![
 Hashes::SHA2_224 => &[
 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x04, 0x05, 0x00, 0x04, 0x1c,
 ],
 Hashes::SHA2_256 => vec![
 Hashes::SHA2_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA2_384 => vec![
 Hashes::SHA2_384 => &[
 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x02, 0x05, 0x00, 0x04, 0x30,
 ],

 Hashes::SHA2_512 => vec![
 Hashes::SHA2_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x03, 0x05, 0x00, 0x04, 0x40,
 ],

 // A special TLS case which doesn't use an ASN1 prefix
 Hashes::MD5SHA1 => Vec::new(),
 Hashes::RIPEMD160 => vec![
 Hashes::MD5SHA1 => &[],
 Hashes::RIPEMD160 => &[
 0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
 ],

 Hashes::SHA3_256 => vec![
 Hashes::SHA3_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA3_384 => vec![
 Hashes::SHA3_384 => &[
 30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],

 Hashes::SHA3_512 => vec![
 Hashes::SHA3_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x0a, 0x05, 0x00, 0x04, 0x40,
 ],
Expand Down

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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

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
Implement PSS#26

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

roblabla
wants to merge
7
commits into

from

 Closed


Implement PSS
#26
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
5d28baf

Implement PSS


roblabla Aug 21, 2019
2462f1d

Remove PublicKey trait, use deref.


roblabla Sep 26, 2019
071f07f

Avoid using vectors to store the asn1 prefixes


roblabla Sep 26, 2019
527acfc

Use separate functions for different padding schemes


roblabla Sep 26, 2019
b821cc6

Add new sign_pss/verify_pss


roblabla Sep 26, 2019
30220cf

Fix the tests


roblabla Sep 26, 2019
610c4cc

Move copy_with_left_pad to algorithms


roblabla Sep 26, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down

10 changes: 10 additions & 0 deletions
src/algorithms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
 primes,
 ))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
 // left pad with zeros
 let padding_bytes = dest.len() - src.len();
 for el in dest.iter_mut().take(padding_bytes) {
 *el = 0;
 }
 dest[padding_bytes..].copy_from_slice(src);
}

26 changes: 13 additions & 13 deletions
src/hash.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
 fn size(&self) -> usize;

 /// Returns the ASN1 DER prefix for the the hash function.
 fn asn1_prefix(&self) -> Vec<u8>;
 fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
 }
 }

 fn asn1_prefix(&self) -> Vec<u8> {
 fn asn1_prefix(&self) -> &'static [u8] {
 match *self {
 Hashes::MD5 => vec![
 Hashes::MD5 => &[
 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
 0x05, 0x00, 0x04, 0x10,
 ],
 Hashes::SHA1 => vec![
 Hashes::SHA1 => &[
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
 0x14,
 ],
 Hashes::SHA2_224 => vec![
 Hashes::SHA2_224 => &[
 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x04, 0x05, 0x00, 0x04, 0x1c,
 ],
 Hashes::SHA2_256 => vec![
 Hashes::SHA2_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA2_384 => vec![
 Hashes::SHA2_384 => &[
 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x02, 0x05, 0x00, 0x04, 0x30,
 ],

 Hashes::SHA2_512 => vec![
 Hashes::SHA2_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x03, 0x05, 0x00, 0x04, 0x40,
 ],

 // A special TLS case which doesn't use an ASN1 prefix
 Hashes::MD5SHA1 => Vec::new(),
 Hashes::RIPEMD160 => vec![
 Hashes::MD5SHA1 => &[],
 Hashes::RIPEMD160 => &[
 0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
 ],

 Hashes::SHA3_256 => vec![
 Hashes::SHA3_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA3_384 => vec![
 Hashes::SHA3_384 => &[
 30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],

 Hashes::SHA3_512 => vec![
 Hashes::SHA3_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x0a, 0x05, 0x00, 0x04, 0x40,
 ],
Expand Down

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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

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
Implement PSS#26

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Closed

roblabla
wants to merge
7
commits into

from

 Closed


Implement PSS
#26
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
5d28baf

Implement PSS


roblabla Aug 21, 2019
2462f1d

Remove PublicKey trait, use deref.


roblabla Sep 26, 2019
071f07f

Avoid using vectors to store the asn1 prefixes


roblabla Sep 26, 2019
527acfc

Use separate functions for different padding schemes


roblabla Sep 26, 2019
b821cc6

Add new sign_pss/verify_pss


roblabla Sep 26, 2019
30220cf

Fix the tests


roblabla Sep 26, 2019
610c4cc

Move copy_with_left_pad to algorithms


roblabla Sep 26, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ rand = "0.6.5"
byteorder = "1.3.1"
failure = "0.1.5"
subtle = "2.0.0"
digest = "0.8"

[dependencies.zeroize]
version = "0.6"
Expand All@@ -34,10 +35,9 @@ features = ["std", "derive"]

[dev-dependencies]
base64 = "0.10.1"
sha-1 = "0.8.1"
sha2 = "0.8.0"
hex = "0.3.2"
serde_test = "1.0.89"
sha-1 = "0.8.1"


[[bench]]
Expand Down

10 changes: 10 additions & 0 deletions
src/algorithms.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,3 +110,13 @@ pub fn generate_multi_prime_key<R: Rng>(
 primes,
 ))
}

#[inline]
pub fn copy_with_left_pad(dest: &mut [u8], src: &[u8]) {
 // left pad with zeros
 let padding_bytes = dest.len() - src.len();
 for el in dest.iter_mut().take(padding_bytes) {
 *el = 0;
 }
 dest[padding_bytes..].copy_from_slice(src);
}

26 changes: 13 additions & 13 deletions
src/hash.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub trait Hash {
 fn size(&self) -> usize;

 /// Returns the ASN1 DER prefix for the the hash function.
 fn asn1_prefix(&self) -> Vec<u8>;
 fn asn1_prefix(&self) -> &'static [u8];
}

/// A list of provided hashes, implementing `Hash`.
Expand DownExpand Up@@ -41,50 +41,50 @@ impl Hash for Hashes {
 }
 }

 fn asn1_prefix(&self) -> Vec<u8> {
 fn asn1_prefix(&self) -> &'static [u8] {
 match *self {
 Hashes::MD5 => vec![
 Hashes::MD5 => &[
 0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05,
 0x05, 0x00, 0x04, 0x10,
 ],
 Hashes::SHA1 => vec![
 Hashes::SHA1 => &[
 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04,
 0x14,
 ],
 Hashes::SHA2_224 => vec![
 Hashes::SHA2_224 => &[
 0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x04, 0x05, 0x00, 0x04, 0x1c,
 ],
 Hashes::SHA2_256 => vec![
 Hashes::SHA2_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x01, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA2_384 => vec![
 Hashes::SHA2_384 => &[
 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x02, 0x05, 0x00, 0x04, 0x30,
 ],

 Hashes::SHA2_512 => vec![
 Hashes::SHA2_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x03, 0x05, 0x00, 0x04, 0x40,
 ],

 // A special TLS case which doesn't use an ASN1 prefix
 Hashes::MD5SHA1 => Vec::new(),
 Hashes::RIPEMD160 => vec![
 Hashes::MD5SHA1 => &[],
 Hashes::RIPEMD160 => &[
 0x30, 0x20, 0x30, 0x08, 0x06, 0x06, 0x28, 0xcf, 0x06, 0x03, 0x00, 0x31, 0x04, 0x14,
 ],

 Hashes::SHA3_256 => vec![
 Hashes::SHA3_256 => &[
 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],
 Hashes::SHA3_384 => vec![
 Hashes::SHA3_384 => &[
 30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x08, 0x05, 0x00, 0x04, 0x20,
 ],

 Hashes::SHA3_512 => vec![
 Hashes::SHA3_512 => &[
 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02,
 0x0a, 0x05, 0x00, 0x04, 0x40,
 ],
Expand Down

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::{RSAPublicKey, 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(key: &RSAPublicKey, 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>(rng: &mut R, key: &RSAPublicKey, 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: &RSAPublicKey, m: &BigUint, unblinder: &BigUint) -> BigUint {
 (m * unblinder) % key.n()
}

Expand Down
Loading