Skip to content

cipher: consolidate error types#373

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
newpavlov merged 1 commit into from
Nov 28, 2020
Merged

cipher: consolidate error types #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions cipher/src/block.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,7 @@
#[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
pub mod dev;

mod errors;

pub use errors::InvalidKeyLength;

use crate::errors::InvalidLength;
use core::convert::TryInto;
use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};

Expand All@@ -41,9 +38,9 @@ pub trait NewBlockCipher: Sized {
///
/// Default implementation will accept only keys with length equal to
/// `KeySize`, but some ciphers can accept range of key lengths.
fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
fn new_varkey(key: &[u8]) -> Result<Self, InvalidLength> {
if key.len() != Self::KeySize::to_usize() {
Err(InvalidKeyLength)
Err(InvalidLength)
} else {
Ok(Self::new(GenericArray::from_slice(key)))
}
Expand Down
14 changes: 0 additions & 14 deletions cipher/src/block/errors.rs
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions cipher/src/stream/errors.rs → cipher/src/errors.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
//! Error types

use core::fmt;

/// The error type returned when stream cipher has reached the end of a keystream.
Expand All@@ -16,16 +18,16 @@ impl std::error::Error for LoopError {}
/// The error type returned when key and/or nonce used in stream cipher
/// initialization had an invalid length.
#[derive(Copy, Clone, Debug)]
pub struct InvalidKeyNonceLength;
pub struct InvalidLength;

impl fmt::Display for InvalidKeyNonceLength {
impl fmt::Display for InvalidLength {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
f.write_str("Loop Error")
}
}

#[cfg(feature = "std")]
impl std::error::Error for InvalidKeyNonceLength {}
impl std::error::Error for InvalidLength {}

/// The error type returned when a cipher position can not be represented
/// by the requested type.
Expand Down
1 change: 1 addition & 0 deletions cipher/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
extern crate std;

pub mod block;
pub mod errors;
pub mod stream;

pub use crate::{
Expand Down
19 changes: 9 additions & 10 deletions cipher/src/stream.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
#[cfg(feature = "dev")]
mod dev;

mod errors;

pub use errors::{InvalidKeyNonceLength, LoopError, OverflowError};

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

use crate::block::{BlockCipher, NewBlockCipher};
use crate::{
block::{BlockCipher, NewBlockCipher},
errors::{InvalidLength, LoopError, OverflowError},
};
use core::convert::{TryFrom, TryInto};
use generic_array::typenum::Unsigned;
use generic_array::{ArrayLength, GenericArray};
Expand All@@ -39,11 +38,11 @@ pub trait NewStreamCipher: Sized {

/// Create new stream cipher instance from variable length key and nonce.
#[inline]
fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
let kl = Self::KeySize::to_usize();
let nl = Self::NonceSize::to_usize();
if key.len() != kl || nonce.len() != nl {
Err(InvalidKeyNonceLength)
Err(InvalidLength)
} else {
let key = GenericArray::from_slice(key);
let nonce = GenericArray::from_slice(nonce);
Expand DownExpand Up@@ -178,12 +177,12 @@ where
)
}

fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
if nonce.len() != Self::NonceSize::USIZE {
Err(InvalidKeyNonceLength)
Err(InvalidLength)
} else {
C::BlockCipher::new_varkey(key)
.map_err(|_| InvalidKeyNonceLength)
.map_err(|_| InvalidLength)
.map(|cipher| {
let nonce = GenericArray::from_slice(nonce);
Self::from_block_cipher(cipher, nonce)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
cipher: consolidate error types by tarcieri · Pull Request #373 · RustCrypto/traits · GitHub
Skip to content
cipher: consolidate error types#373

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

newpavlov
merged 1 commit into

from

Nov 28, 2020
 Merged


cipher: consolidate error types
#373
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 3 additions & 6 deletions
cipher/src/block.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,7 @@
#[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
pub mod dev;

mod errors;

pub use errors::InvalidKeyLength;

use crate::errors::InvalidLength;
use core::convert::TryInto;
use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};

Expand All@@ -41,9 +38,9 @@ pub trait NewBlockCipher: Sized {
 ///
 /// Default implementation will accept only keys with length equal to
 /// `KeySize`, but some ciphers can accept range of key lengths.
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidLength> {
 if key.len() != Self::KeySize::to_usize() {
 Err(InvalidKeyLength)
 Err(InvalidLength)
 } else {
 Ok(Self::new(GenericArray::from_slice(key)))
 }
Expand Down

14 changes: 0 additions & 14 deletions
cipher/src/block/errors.rs

View file


Open in desktop


This file was deleted.


8 changes: 5 additions & 3 deletions
cipher/src/stream/errors.rs → cipher/src/errors.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
//! Error types

use core::fmt;

/// The error type returned when stream cipher has reached the end of a keystream.
Expand All@@ -16,16 +18,16 @@ impl std::error::Error for LoopError {}
/// The error type returned when key and/or nonce used in stream cipher
/// initialization had an invalid length.
#[derive(Copy, Clone, Debug)]
pub struct InvalidKeyNonceLength;
pub struct InvalidLength;

impl fmt::Display for InvalidKeyNonceLength {
impl fmt::Display for InvalidLength {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
 f.write_str("Loop Error")
 }
}

#[cfg(feature = "std")]
impl std::error::Error for InvalidKeyNonceLength {}
impl std::error::Error for InvalidLength {}

/// The error type returned when a cipher position can not be represented
/// by the requested type.
Expand Down

1 change: 1 addition & 0 deletions
cipher/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
extern crate std;

pub mod block;
pub mod errors;
pub mod stream;

pub use crate::{
Expand Down

19 changes: 9 additions & 10 deletions
cipher/src/stream.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
#[cfg(feature = "dev")]
mod dev;

mod errors;

pub use errors::{InvalidKeyNonceLength, LoopError, OverflowError};

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

use crate::block::{BlockCipher, NewBlockCipher};
use crate::{
 block::{BlockCipher, NewBlockCipher},
 errors::{InvalidLength, LoopError, OverflowError},
};
use core::convert::{TryFrom, TryInto};
use generic_array::typenum::Unsigned;
use generic_array::{ArrayLength, GenericArray};
Expand All@@ -39,11 +38,11 @@ pub trait NewStreamCipher: Sized {

 /// Create new stream cipher instance from variable length key and nonce.
 #[inline]
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 let kl = Self::KeySize::to_usize();
 let nl = Self::NonceSize::to_usize();
 if key.len() != kl || nonce.len() != nl {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 let key = GenericArray::from_slice(key);
 let nonce = GenericArray::from_slice(nonce);
Expand DownExpand Up@@ -178,12 +177,12 @@ where
 )
 }

 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 if nonce.len() != Self::NonceSize::USIZE {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 C::BlockCipher::new_varkey(key)
 .map_err(|_| InvalidKeyNonceLength)
 .map_err(|_| InvalidLength)
 .map(|cipher| {
 let nonce = GenericArray::from_slice(nonce);
 Self::from_block_cipher(cipher, nonce)
Expand Down

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

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

newpavlov
merged 1 commit into

from

Nov 28, 2020
 Merged


cipher: consolidate error types
#373
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 3 additions & 6 deletions
cipher/src/block.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,7 @@
#[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
pub mod dev;

mod errors;

pub use errors::InvalidKeyLength;

use crate::errors::InvalidLength;
use core::convert::TryInto;
use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};

Expand All@@ -41,9 +38,9 @@ pub trait NewBlockCipher: Sized {
 ///
 /// Default implementation will accept only keys with length equal to
 /// `KeySize`, but some ciphers can accept range of key lengths.
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidLength> {
 if key.len() != Self::KeySize::to_usize() {
 Err(InvalidKeyLength)
 Err(InvalidLength)
 } else {
 Ok(Self::new(GenericArray::from_slice(key)))
 }
Expand Down

14 changes: 0 additions & 14 deletions
cipher/src/block/errors.rs

View file


Open in desktop


This file was deleted.


8 changes: 5 additions & 3 deletions
cipher/src/stream/errors.rs → cipher/src/errors.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
//! Error types

use core::fmt;

/// The error type returned when stream cipher has reached the end of a keystream.
Expand All@@ -16,16 +18,16 @@ impl std::error::Error for LoopError {}
/// The error type returned when key and/or nonce used in stream cipher
/// initialization had an invalid length.
#[derive(Copy, Clone, Debug)]
pub struct InvalidKeyNonceLength;
pub struct InvalidLength;

impl fmt::Display for InvalidKeyNonceLength {
impl fmt::Display for InvalidLength {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
 f.write_str("Loop Error")
 }
}

#[cfg(feature = "std")]
impl std::error::Error for InvalidKeyNonceLength {}
impl std::error::Error for InvalidLength {}

/// The error type returned when a cipher position can not be represented
/// by the requested type.
Expand Down

1 change: 1 addition & 0 deletions
cipher/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
extern crate std;

pub mod block;
pub mod errors;
pub mod stream;

pub use crate::{
Expand Down

19 changes: 9 additions & 10 deletions
cipher/src/stream.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
#[cfg(feature = "dev")]
mod dev;

mod errors;

pub use errors::{InvalidKeyNonceLength, LoopError, OverflowError};

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

use crate::block::{BlockCipher, NewBlockCipher};
use crate::{
 block::{BlockCipher, NewBlockCipher},
 errors::{InvalidLength, LoopError, OverflowError},
};
use core::convert::{TryFrom, TryInto};
use generic_array::typenum::Unsigned;
use generic_array::{ArrayLength, GenericArray};
Expand All@@ -39,11 +38,11 @@ pub trait NewStreamCipher: Sized {

 /// Create new stream cipher instance from variable length key and nonce.
 #[inline]
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 let kl = Self::KeySize::to_usize();
 let nl = Self::NonceSize::to_usize();
 if key.len() != kl || nonce.len() != nl {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 let key = GenericArray::from_slice(key);
 let nonce = GenericArray::from_slice(nonce);
Expand DownExpand Up@@ -178,12 +177,12 @@ where
 )
 }

 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 if nonce.len() != Self::NonceSize::USIZE {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 C::BlockCipher::new_varkey(key)
 .map_err(|_| InvalidKeyNonceLength)
 .map_err(|_| InvalidLength)
 .map(|cipher| {
 let nonce = GenericArray::from_slice(nonce);
 Self::from_block_cipher(cipher, nonce)
Expand Down

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

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

newpavlov
merged 1 commit into

from

Nov 28, 2020
 Merged


cipher: consolidate error types
#373
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 3 additions & 6 deletions
cipher/src/block.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,7 @@
#[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
pub mod dev;

mod errors;

pub use errors::InvalidKeyLength;

use crate::errors::InvalidLength;
use core::convert::TryInto;
use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};

Expand All@@ -41,9 +38,9 @@ pub trait NewBlockCipher: Sized {
 ///
 /// Default implementation will accept only keys with length equal to
 /// `KeySize`, but some ciphers can accept range of key lengths.
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidLength> {
 if key.len() != Self::KeySize::to_usize() {
 Err(InvalidKeyLength)
 Err(InvalidLength)
 } else {
 Ok(Self::new(GenericArray::from_slice(key)))
 }
Expand Down

14 changes: 0 additions & 14 deletions
cipher/src/block/errors.rs

View file


Open in desktop


This file was deleted.


8 changes: 5 additions & 3 deletions
cipher/src/stream/errors.rs → cipher/src/errors.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
//! Error types

use core::fmt;

/// The error type returned when stream cipher has reached the end of a keystream.
Expand All@@ -16,16 +18,16 @@ impl std::error::Error for LoopError {}
/// The error type returned when key and/or nonce used in stream cipher
/// initialization had an invalid length.
#[derive(Copy, Clone, Debug)]
pub struct InvalidKeyNonceLength;
pub struct InvalidLength;

impl fmt::Display for InvalidKeyNonceLength {
impl fmt::Display for InvalidLength {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
 f.write_str("Loop Error")
 }
}

#[cfg(feature = "std")]
impl std::error::Error for InvalidKeyNonceLength {}
impl std::error::Error for InvalidLength {}

/// The error type returned when a cipher position can not be represented
/// by the requested type.
Expand Down

1 change: 1 addition & 0 deletions
cipher/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
extern crate std;

pub mod block;
pub mod errors;
pub mod stream;

pub use crate::{
Expand Down

19 changes: 9 additions & 10 deletions
cipher/src/stream.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
#[cfg(feature = "dev")]
mod dev;

mod errors;

pub use errors::{InvalidKeyNonceLength, LoopError, OverflowError};

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

use crate::block::{BlockCipher, NewBlockCipher};
use crate::{
 block::{BlockCipher, NewBlockCipher},
 errors::{InvalidLength, LoopError, OverflowError},
};
use core::convert::{TryFrom, TryInto};
use generic_array::typenum::Unsigned;
use generic_array::{ArrayLength, GenericArray};
Expand All@@ -39,11 +38,11 @@ pub trait NewStreamCipher: Sized {

 /// Create new stream cipher instance from variable length key and nonce.
 #[inline]
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 let kl = Self::KeySize::to_usize();
 let nl = Self::NonceSize::to_usize();
 if key.len() != kl || nonce.len() != nl {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 let key = GenericArray::from_slice(key);
 let nonce = GenericArray::from_slice(nonce);
Expand DownExpand Up@@ -178,12 +177,12 @@ where
 )
 }

 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 if nonce.len() != Self::NonceSize::USIZE {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 C::BlockCipher::new_varkey(key)
 .map_err(|_| InvalidKeyNonceLength)
 .map_err(|_| InvalidLength)
 .map(|cipher| {
 let nonce = GenericArray::from_slice(nonce);
 Self::from_block_cipher(cipher, nonce)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
cipher: consolidate error types by tarcieri · Pull Request #373 · RustCrypto/traits · GitHub
Skip to content
cipher: consolidate error types#373

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

newpavlov
merged 1 commit into

from

Nov 28, 2020
 Merged


cipher: consolidate error types
#373
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 3 additions & 6 deletions
cipher/src/block.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,7 @@
#[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
pub mod dev;

mod errors;

pub use errors::InvalidKeyLength;

use crate::errors::InvalidLength;
use core::convert::TryInto;
use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};

Expand All@@ -41,9 +38,9 @@ pub trait NewBlockCipher: Sized {
 ///
 /// Default implementation will accept only keys with length equal to
 /// `KeySize`, but some ciphers can accept range of key lengths.
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidLength> {
 if key.len() != Self::KeySize::to_usize() {
 Err(InvalidKeyLength)
 Err(InvalidLength)
 } else {
 Ok(Self::new(GenericArray::from_slice(key)))
 }
Expand Down

14 changes: 0 additions & 14 deletions
cipher/src/block/errors.rs

View file


Open in desktop


This file was deleted.


8 changes: 5 additions & 3 deletions
cipher/src/stream/errors.rs → cipher/src/errors.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
//! Error types

use core::fmt;

/// The error type returned when stream cipher has reached the end of a keystream.
Expand All@@ -16,16 +18,16 @@ impl std::error::Error for LoopError {}
/// The error type returned when key and/or nonce used in stream cipher
/// initialization had an invalid length.
#[derive(Copy, Clone, Debug)]
pub struct InvalidKeyNonceLength;
pub struct InvalidLength;

impl fmt::Display for InvalidKeyNonceLength {
impl fmt::Display for InvalidLength {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
 f.write_str("Loop Error")
 }
}

#[cfg(feature = "std")]
impl std::error::Error for InvalidKeyNonceLength {}
impl std::error::Error for InvalidLength {}

/// The error type returned when a cipher position can not be represented
/// by the requested type.
Expand Down

1 change: 1 addition & 0 deletions
cipher/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
extern crate std;

pub mod block;
pub mod errors;
pub mod stream;

pub use crate::{
Expand Down

19 changes: 9 additions & 10 deletions
cipher/src/stream.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
#[cfg(feature = "dev")]
mod dev;

mod errors;

pub use errors::{InvalidKeyNonceLength, LoopError, OverflowError};

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

use crate::block::{BlockCipher, NewBlockCipher};
use crate::{
 block::{BlockCipher, NewBlockCipher},
 errors::{InvalidLength, LoopError, OverflowError},
};
use core::convert::{TryFrom, TryInto};
use generic_array::typenum::Unsigned;
use generic_array::{ArrayLength, GenericArray};
Expand All@@ -39,11 +38,11 @@ pub trait NewStreamCipher: Sized {

 /// Create new stream cipher instance from variable length key and nonce.
 #[inline]
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 let kl = Self::KeySize::to_usize();
 let nl = Self::NonceSize::to_usize();
 if key.len() != kl || nonce.len() != nl {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 let key = GenericArray::from_slice(key);
 let nonce = GenericArray::from_slice(nonce);
Expand DownExpand Up@@ -178,12 +177,12 @@ where
 )
 }

 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 if nonce.len() != Self::NonceSize::USIZE {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 C::BlockCipher::new_varkey(key)
 .map_err(|_| InvalidKeyNonceLength)
 .map_err(|_| InvalidLength)
 .map(|cipher| {
 let nonce = GenericArray::from_slice(nonce);
 Self::from_block_cipher(cipher, nonce)
Expand Down

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

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

newpavlov
merged 1 commit into

from

Nov 28, 2020
 Merged


cipher: consolidate error types
#373
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 3 additions & 6 deletions
cipher/src/block.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,7 @@
#[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
pub mod dev;

mod errors;

pub use errors::InvalidKeyLength;

use crate::errors::InvalidLength;
use core::convert::TryInto;
use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};

Expand All@@ -41,9 +38,9 @@ pub trait NewBlockCipher: Sized {
 ///
 /// Default implementation will accept only keys with length equal to
 /// `KeySize`, but some ciphers can accept range of key lengths.
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidLength> {
 if key.len() != Self::KeySize::to_usize() {
 Err(InvalidKeyLength)
 Err(InvalidLength)
 } else {
 Ok(Self::new(GenericArray::from_slice(key)))
 }
Expand Down

14 changes: 0 additions & 14 deletions
cipher/src/block/errors.rs

View file


Open in desktop


This file was deleted.


8 changes: 5 additions & 3 deletions
cipher/src/stream/errors.rs → cipher/src/errors.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
//! Error types

use core::fmt;

/// The error type returned when stream cipher has reached the end of a keystream.
Expand All@@ -16,16 +18,16 @@ impl std::error::Error for LoopError {}
/// The error type returned when key and/or nonce used in stream cipher
/// initialization had an invalid length.
#[derive(Copy, Clone, Debug)]
pub struct InvalidKeyNonceLength;
pub struct InvalidLength;

impl fmt::Display for InvalidKeyNonceLength {
impl fmt::Display for InvalidLength {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
 f.write_str("Loop Error")
 }
}

#[cfg(feature = "std")]
impl std::error::Error for InvalidKeyNonceLength {}
impl std::error::Error for InvalidLength {}

/// The error type returned when a cipher position can not be represented
/// by the requested type.
Expand Down

1 change: 1 addition & 0 deletions
cipher/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
extern crate std;

pub mod block;
pub mod errors;
pub mod stream;

pub use crate::{
Expand Down

19 changes: 9 additions & 10 deletions
cipher/src/stream.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
#[cfg(feature = "dev")]
mod dev;

mod errors;

pub use errors::{InvalidKeyNonceLength, LoopError, OverflowError};

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

use crate::block::{BlockCipher, NewBlockCipher};
use crate::{
 block::{BlockCipher, NewBlockCipher},
 errors::{InvalidLength, LoopError, OverflowError},
};
use core::convert::{TryFrom, TryInto};
use generic_array::typenum::Unsigned;
use generic_array::{ArrayLength, GenericArray};
Expand All@@ -39,11 +38,11 @@ pub trait NewStreamCipher: Sized {

 /// Create new stream cipher instance from variable length key and nonce.
 #[inline]
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 let kl = Self::KeySize::to_usize();
 let nl = Self::NonceSize::to_usize();
 if key.len() != kl || nonce.len() != nl {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 let key = GenericArray::from_slice(key);
 let nonce = GenericArray::from_slice(nonce);
Expand DownExpand Up@@ -178,12 +177,12 @@ where
 )
 }

 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 if nonce.len() != Self::NonceSize::USIZE {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 C::BlockCipher::new_varkey(key)
 .map_err(|_| InvalidKeyNonceLength)
 .map_err(|_| InvalidLength)
 .map(|cipher| {
 let nonce = GenericArray::from_slice(nonce);
 Self::from_block_cipher(cipher, nonce)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
cipher: consolidate error types by tarcieri · Pull Request #373 · RustCrypto/traits · GitHub
Skip to content
cipher: consolidate error types#373

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

newpavlov
merged 1 commit into

from

Nov 28, 2020
 Merged


cipher: consolidate error types
#373
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


9 changes: 3 additions & 6 deletions
cipher/src/block.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,7 @@
#[cfg_attr(docsrs, doc(cfg(feature = "dev")))]
pub mod dev;

mod errors;

pub use errors::InvalidKeyLength;

use crate::errors::InvalidLength;
use core::convert::TryInto;
use generic_array::{typenum::Unsigned, ArrayLength, GenericArray};

Expand All@@ -41,9 +38,9 @@ pub trait NewBlockCipher: Sized {
 ///
 /// Default implementation will accept only keys with length equal to
 /// `KeySize`, but some ciphers can accept range of key lengths.
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidKeyLength> {
 fn new_varkey(key: &[u8]) -> Result<Self, InvalidLength> {
 if key.len() != Self::KeySize::to_usize() {
 Err(InvalidKeyLength)
 Err(InvalidLength)
 } else {
 Ok(Self::new(GenericArray::from_slice(key)))
 }
Expand Down

14 changes: 0 additions & 14 deletions
cipher/src/block/errors.rs

View file


Open in desktop


This file was deleted.


8 changes: 5 additions & 3 deletions
cipher/src/stream/errors.rs → cipher/src/errors.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
//! Error types

use core::fmt;

/// The error type returned when stream cipher has reached the end of a keystream.
Expand All@@ -16,16 +18,16 @@ impl std::error::Error for LoopError {}
/// The error type returned when key and/or nonce used in stream cipher
/// initialization had an invalid length.
#[derive(Copy, Clone, Debug)]
pub struct InvalidKeyNonceLength;
pub struct InvalidLength;

impl fmt::Display for InvalidKeyNonceLength {
impl fmt::Display for InvalidLength {
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
 f.write_str("Loop Error")
 }
}

#[cfg(feature = "std")]
impl std::error::Error for InvalidKeyNonceLength {}
impl std::error::Error for InvalidLength {}

/// The error type returned when a cipher position can not be represented
/// by the requested type.
Expand Down

1 change: 1 addition & 0 deletions
cipher/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@
extern crate std;

pub mod block;
pub mod errors;
pub mod stream;

pub use crate::{
Expand Down

19 changes: 9 additions & 10 deletions
cipher/src/stream.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,13 @@
#[cfg(feature = "dev")]
mod dev;

mod errors;

pub use errors::{InvalidKeyNonceLength, LoopError, OverflowError};

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

use crate::block::{BlockCipher, NewBlockCipher};
use crate::{
 block::{BlockCipher, NewBlockCipher},
 errors::{InvalidLength, LoopError, OverflowError},
};
use core::convert::{TryFrom, TryInto};
use generic_array::typenum::Unsigned;
use generic_array::{ArrayLength, GenericArray};
Expand All@@ -39,11 +38,11 @@ pub trait NewStreamCipher: Sized {

 /// Create new stream cipher instance from variable length key and nonce.
 #[inline]
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 let kl = Self::KeySize::to_usize();
 let nl = Self::NonceSize::to_usize();
 if key.len() != kl || nonce.len() != nl {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 let key = GenericArray::from_slice(key);
 let nonce = GenericArray::from_slice(nonce);
Expand DownExpand Up@@ -178,12 +177,12 @@ where
 )
 }

 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidKeyNonceLength> {
 fn new_var(key: &[u8], nonce: &[u8]) -> Result<Self, InvalidLength> {
 if nonce.len() != Self::NonceSize::USIZE {
 Err(InvalidKeyNonceLength)
 Err(InvalidLength)
 } else {
 C::BlockCipher::new_varkey(key)
 .map_err(|_| InvalidKeyNonceLength)
 .map_err(|_| InvalidLength)
 .map(|cipher| {
 let nonce = GenericArray::from_slice(nonce);
 Self::from_block_cipher(cipher, nonce)
Expand Down