Skip to content

ssh-key: initial aes256-gcm@openssh.com support#75

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Mar 7, 2023
Merged

ssh-key: initial aes256-gcm@openssh.com support #75

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
7 changes: 5 additions & 2 deletions .github/workflows/ssh-key.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
with:
toolchain: ${{ matrix.rust }}
- uses: RustCrypto/actions/cargo-hack-install@master
- run: cargo hack test --feature-powerset --exclude-features default,std
- run: cargo test
- run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
- run: cargo test --features aes-gcm
- run: cargo test --features encryption
- run: cargo test --features getrandom
- run: cargo test --features std
- run: cargo test --all-features
63 changes: 63 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ssh-key/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
"signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down
74 changes: 63 additions & 11 deletions ssh-key/src/cipher.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

/// AES-256 in counter (CTR) mode.
Aes256Ctr,

/// AES-256 in Galois/Counter Mode (GCM).
Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
match ciphername {
"none" => Ok(Self::None),
AES256_CTR => Ok(Self::Aes256Ctr),
AES256_GCM => Ok(Self::Aes256Gcm),
_ => Err(Error::Algorithm),
}
}
Expand All@@ -48,6 +67,7 @@ impl Cipher {
match self {
Self::None => "none",
Self::Aes256Ctr => AES256_CTR,
Self::Aes256Gcm => AES256_GCM,
}
}

Expand All@@ -56,14 +76,15 @@ impl Cipher {
match self {
Self::None => None,
Self::Aes256Ctr => Some((32, 16)),
Self::Aes256Gcm => Some((32, 12)),
}
}

/// Get the block size for this cipher in bytes.
pub fn block_size(self) -> usize {
match self {
Self::None => 8,
Self::Aes256Ctr => 16,
Self::Aes256Ctr | Self::Aes256Gcm => 16,
}
}

Expand All@@ -77,6 +98,11 @@ impl Cipher {
}
}

/// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
pub fn has_tag(self) -> bool {
matches!(self, Self::Aes256Gcm)
}

/// Is this cipher `none`?
pub fn is_none(self) -> bool {
self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

/// Decrypt the ciphertext in the `buffer` in-place using this cipher.
#[cfg(feature = "encryption")]
pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
match self {
Self::None => return Err(Error::Crypto),
// Counter mode encryption and decryption are the same operation
Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
}
Self::Aes256Ctr => {
if tag.is_some() {
return Err(Error::Crypto);
}

// Counter mode encryption and decryption are the same operation
self.encrypt(key, iv, buffer)?;
Ok(())
}
#[cfg(feature = "aes-gcm")]
Self::Aes256Gcm => {
let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
let tag = tag.ok_or(Error::Crypto)?;
cipher
.decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
.map_err(|_| Error::Crypto)?;

Ok(())
Ok(())
}
_ => Err(Error::Crypto),
}
}

/// Encrypt the ciphertext in the `buffer` in-place using this cipher.
#[cfg(feature = "encryption")]
pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
match self {
Self::None => return Err(Error::Crypto),
Self::Aes256Ctr => {
let cipher = Aes256::new_from_slice(key)
.and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
cipher
.try_apply_keystream_partial(buffer.into())
.map_err(|_| Error::Crypto)?;

Ok(None)
}
}
#[cfg(feature = "aes-gcm")]
Self::Aes256Gcm => {
let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
let tag = cipher
.encrypt_in_place_detached(&nonce.into(), &[], buffer)
.map_err(|_| Error::Crypto)?;

Ok(())
Ok(Some(tag.into()))
}
_ => Err(Error::Crypto),
}
}
}

Expand Down
Loading
, '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" + '
ssh-key: initial `aes256-gcm@openssh.com` support by tarcieri · Pull Request #75 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: initial aes256-gcm@openssh.com support#75

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: initial aes256-gcm@openssh.com support
#75
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


7 changes: 5 additions & 2 deletions
.github/workflows/ssh-key.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
 with:
 toolchain: ${{ matrix.rust }}
 - uses: RustCrypto/actions/cargo-hack-install@master
 - run: cargo hack test --feature-powerset --exclude-features default,std
 - run: cargo test
 - run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
 - run: cargo test --features aes-gcm
 - run: cargo test --features encryption
 - run: cargo test --features getrandom
 - run: cargo test --features std
 - run: cargo test --all-features

63 changes: 63 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
ssh-key/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
 "signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down

74 changes: 63 additions & 11 deletions
ssh-key/src/cipher.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
 Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

 /// AES-256 in counter (CTR) mode.
 Aes256Ctr,

 /// AES-256 in Galois/Counter Mode (GCM).
 Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
 match ciphername {
 "none" => Ok(Self::None),
 AES256_CTR => Ok(Self::Aes256Ctr),
 AES256_GCM => Ok(Self::Aes256Gcm),
 _ => Err(Error::Algorithm),
 }
 }
Expand All@@ -48,6 +67,7 @@ impl Cipher {
 match self {
 Self::None => "none",
 Self::Aes256Ctr => AES256_CTR,
 Self::Aes256Gcm => AES256_GCM,
 }
 }

Expand All@@ -56,14 +76,15 @@ impl Cipher {
 match self {
 Self::None => None,
 Self::Aes256Ctr => Some((32, 16)),
 Self::Aes256Gcm => Some((32, 12)),
 }
 }

 /// Get the block size for this cipher in bytes.
 pub fn block_size(self) -> usize {
 match self {
 Self::None => 8,
 Self::Aes256Ctr => 16,
 Self::Aes256Ctr | Self::Aes256Gcm => 16,
 }
 }

Expand All@@ -77,6 +98,11 @@ impl Cipher {
 }
 }

 /// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
 pub fn has_tag(self) -> bool {
 matches!(self, Self::Aes256Gcm)
 }

 /// Is this cipher `none`?
 pub fn is_none(self) -> bool {
 self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

 /// Decrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
 match self {
 Self::None => return Err(Error::Crypto),
 // Counter mode encryption and decryption are the same operation
 Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
 }
 Self::Aes256Ctr => {
 if tag.is_some() {
 return Err(Error::Crypto);
 }

 // Counter mode encryption and decryption are the same operation
 self.encrypt(key, iv, buffer)?;
 Ok(())
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = tag.ok_or(Error::Crypto)?;
 cipher
 .decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(())
 }
 _ => Err(Error::Crypto),
 }
 }

 /// Encrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
 match self {
 Self::None => return Err(Error::Crypto),
 Self::Aes256Ctr => {
 let cipher = Aes256::new_from_slice(key)
 .and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
 cipher
 .try_apply_keystream_partial(buffer.into())
 .map_err(|_| Error::Crypto)?;

 Ok(None)
 }
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = cipher
 .encrypt_in_place_detached(&nonce.into(), &[], buffer)
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(Some(tag.into()))
 }
 _ => Err(Error::Crypto),
 }
 }
}

Expand Down
Loading

, '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('^' + ".*" + '
ssh-key: initial `aes256-gcm@openssh.com` support by tarcieri · Pull Request #75 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: initial aes256-gcm@openssh.com support#75

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: initial aes256-gcm@openssh.com support
#75
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


7 changes: 5 additions & 2 deletions
.github/workflows/ssh-key.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
 with:
 toolchain: ${{ matrix.rust }}
 - uses: RustCrypto/actions/cargo-hack-install@master
 - run: cargo hack test --feature-powerset --exclude-features default,std
 - run: cargo test
 - run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
 - run: cargo test --features aes-gcm
 - run: cargo test --features encryption
 - run: cargo test --features getrandom
 - run: cargo test --features std
 - run: cargo test --all-features

63 changes: 63 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
ssh-key/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
 "signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down

74 changes: 63 additions & 11 deletions
ssh-key/src/cipher.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
 Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

 /// AES-256 in counter (CTR) mode.
 Aes256Ctr,

 /// AES-256 in Galois/Counter Mode (GCM).
 Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
 match ciphername {
 "none" => Ok(Self::None),
 AES256_CTR => Ok(Self::Aes256Ctr),
 AES256_GCM => Ok(Self::Aes256Gcm),
 _ => Err(Error::Algorithm),
 }
 }
Expand All@@ -48,6 +67,7 @@ impl Cipher {
 match self {
 Self::None => "none",
 Self::Aes256Ctr => AES256_CTR,
 Self::Aes256Gcm => AES256_GCM,
 }
 }

Expand All@@ -56,14 +76,15 @@ impl Cipher {
 match self {
 Self::None => None,
 Self::Aes256Ctr => Some((32, 16)),
 Self::Aes256Gcm => Some((32, 12)),
 }
 }

 /// Get the block size for this cipher in bytes.
 pub fn block_size(self) -> usize {
 match self {
 Self::None => 8,
 Self::Aes256Ctr => 16,
 Self::Aes256Ctr | Self::Aes256Gcm => 16,
 }
 }

Expand All@@ -77,6 +98,11 @@ impl Cipher {
 }
 }

 /// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
 pub fn has_tag(self) -> bool {
 matches!(self, Self::Aes256Gcm)
 }

 /// Is this cipher `none`?
 pub fn is_none(self) -> bool {
 self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

 /// Decrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
 match self {
 Self::None => return Err(Error::Crypto),
 // Counter mode encryption and decryption are the same operation
 Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
 }
 Self::Aes256Ctr => {
 if tag.is_some() {
 return Err(Error::Crypto);
 }

 // Counter mode encryption and decryption are the same operation
 self.encrypt(key, iv, buffer)?;
 Ok(())
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = tag.ok_or(Error::Crypto)?;
 cipher
 .decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(())
 }
 _ => Err(Error::Crypto),
 }
 }

 /// Encrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
 match self {
 Self::None => return Err(Error::Crypto),
 Self::Aes256Ctr => {
 let cipher = Aes256::new_from_slice(key)
 .and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
 cipher
 .try_apply_keystream_partial(buffer.into())
 .map_err(|_| Error::Crypto)?;

 Ok(None)
 }
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = cipher
 .encrypt_in_place_detached(&nonce.into(), &[], buffer)
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(Some(tag.into()))
 }
 _ => Err(Error::Crypto),
 }
 }
}

Expand Down
Loading

, '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('^' + ".*" + '
ssh-key: initial `aes256-gcm@openssh.com` support by tarcieri · Pull Request #75 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: initial aes256-gcm@openssh.com support#75

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: initial aes256-gcm@openssh.com support
#75
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


7 changes: 5 additions & 2 deletions
.github/workflows/ssh-key.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
 with:
 toolchain: ${{ matrix.rust }}
 - uses: RustCrypto/actions/cargo-hack-install@master
 - run: cargo hack test --feature-powerset --exclude-features default,std
 - run: cargo test
 - run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
 - run: cargo test --features aes-gcm
 - run: cargo test --features encryption
 - run: cargo test --features getrandom
 - run: cargo test --features std
 - run: cargo test --all-features

63 changes: 63 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
ssh-key/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
 "signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down

74 changes: 63 additions & 11 deletions
ssh-key/src/cipher.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
 Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

 /// AES-256 in counter (CTR) mode.
 Aes256Ctr,

 /// AES-256 in Galois/Counter Mode (GCM).
 Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
 match ciphername {
 "none" => Ok(Self::None),
 AES256_CTR => Ok(Self::Aes256Ctr),
 AES256_GCM => Ok(Self::Aes256Gcm),
 _ => Err(Error::Algorithm),
 }
 }
Expand All@@ -48,6 +67,7 @@ impl Cipher {
 match self {
 Self::None => "none",
 Self::Aes256Ctr => AES256_CTR,
 Self::Aes256Gcm => AES256_GCM,
 }
 }

Expand All@@ -56,14 +76,15 @@ impl Cipher {
 match self {
 Self::None => None,
 Self::Aes256Ctr => Some((32, 16)),
 Self::Aes256Gcm => Some((32, 12)),
 }
 }

 /// Get the block size for this cipher in bytes.
 pub fn block_size(self) -> usize {
 match self {
 Self::None => 8,
 Self::Aes256Ctr => 16,
 Self::Aes256Ctr | Self::Aes256Gcm => 16,
 }
 }

Expand All@@ -77,6 +98,11 @@ impl Cipher {
 }
 }

 /// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
 pub fn has_tag(self) -> bool {
 matches!(self, Self::Aes256Gcm)
 }

 /// Is this cipher `none`?
 pub fn is_none(self) -> bool {
 self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

 /// Decrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
 match self {
 Self::None => return Err(Error::Crypto),
 // Counter mode encryption and decryption are the same operation
 Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
 }
 Self::Aes256Ctr => {
 if tag.is_some() {
 return Err(Error::Crypto);
 }

 // Counter mode encryption and decryption are the same operation
 self.encrypt(key, iv, buffer)?;
 Ok(())
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = tag.ok_or(Error::Crypto)?;
 cipher
 .decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(())
 }
 _ => Err(Error::Crypto),
 }
 }

 /// Encrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
 match self {
 Self::None => return Err(Error::Crypto),
 Self::Aes256Ctr => {
 let cipher = Aes256::new_from_slice(key)
 .and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
 cipher
 .try_apply_keystream_partial(buffer.into())
 .map_err(|_| Error::Crypto)?;

 Ok(None)
 }
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = cipher
 .encrypt_in_place_detached(&nonce.into(), &[], buffer)
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(Some(tag.into()))
 }
 _ => Err(Error::Crypto),
 }
 }
}

Expand Down
Loading

, '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" + '
ssh-key: initial `aes256-gcm@openssh.com` support by tarcieri · Pull Request #75 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: initial aes256-gcm@openssh.com support#75

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: initial aes256-gcm@openssh.com support
#75
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


7 changes: 5 additions & 2 deletions
.github/workflows/ssh-key.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
 with:
 toolchain: ${{ matrix.rust }}
 - uses: RustCrypto/actions/cargo-hack-install@master
 - run: cargo hack test --feature-powerset --exclude-features default,std
 - run: cargo test
 - run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
 - run: cargo test --features aes-gcm
 - run: cargo test --features encryption
 - run: cargo test --features getrandom
 - run: cargo test --features std
 - run: cargo test --all-features

63 changes: 63 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
ssh-key/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
 "signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down

74 changes: 63 additions & 11 deletions
ssh-key/src/cipher.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
 Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

 /// AES-256 in counter (CTR) mode.
 Aes256Ctr,

 /// AES-256 in Galois/Counter Mode (GCM).
 Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
 match ciphername {
 "none" => Ok(Self::None),
 AES256_CTR => Ok(Self::Aes256Ctr),
 AES256_GCM => Ok(Self::Aes256Gcm),
 _ => Err(Error::Algorithm),
 }
 }
Expand All@@ -48,6 +67,7 @@ impl Cipher {
 match self {
 Self::None => "none",
 Self::Aes256Ctr => AES256_CTR,
 Self::Aes256Gcm => AES256_GCM,
 }
 }

Expand All@@ -56,14 +76,15 @@ impl Cipher {
 match self {
 Self::None => None,
 Self::Aes256Ctr => Some((32, 16)),
 Self::Aes256Gcm => Some((32, 12)),
 }
 }

 /// Get the block size for this cipher in bytes.
 pub fn block_size(self) -> usize {
 match self {
 Self::None => 8,
 Self::Aes256Ctr => 16,
 Self::Aes256Ctr | Self::Aes256Gcm => 16,
 }
 }

Expand All@@ -77,6 +98,11 @@ impl Cipher {
 }
 }

 /// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
 pub fn has_tag(self) -> bool {
 matches!(self, Self::Aes256Gcm)
 }

 /// Is this cipher `none`?
 pub fn is_none(self) -> bool {
 self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

 /// Decrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
 match self {
 Self::None => return Err(Error::Crypto),
 // Counter mode encryption and decryption are the same operation
 Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
 }
 Self::Aes256Ctr => {
 if tag.is_some() {
 return Err(Error::Crypto);
 }

 // Counter mode encryption and decryption are the same operation
 self.encrypt(key, iv, buffer)?;
 Ok(())
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = tag.ok_or(Error::Crypto)?;
 cipher
 .decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(())
 }
 _ => Err(Error::Crypto),
 }
 }

 /// Encrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
 match self {
 Self::None => return Err(Error::Crypto),
 Self::Aes256Ctr => {
 let cipher = Aes256::new_from_slice(key)
 .and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
 cipher
 .try_apply_keystream_partial(buffer.into())
 .map_err(|_| Error::Crypto)?;

 Ok(None)
 }
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = cipher
 .encrypt_in_place_detached(&nonce.into(), &[], buffer)
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(Some(tag.into()))
 }
 _ => Err(Error::Crypto),
 }
 }
}

Expand Down
Loading

, '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('^' + ".*" + '
ssh-key: initial `aes256-gcm@openssh.com` support by tarcieri · Pull Request #75 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: initial aes256-gcm@openssh.com support#75

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: initial aes256-gcm@openssh.com support
#75
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


7 changes: 5 additions & 2 deletions
.github/workflows/ssh-key.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
 with:
 toolchain: ${{ matrix.rust }}
 - uses: RustCrypto/actions/cargo-hack-install@master
 - run: cargo hack test --feature-powerset --exclude-features default,std
 - run: cargo test
 - run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
 - run: cargo test --features aes-gcm
 - run: cargo test --features encryption
 - run: cargo test --features getrandom
 - run: cargo test --features std
 - run: cargo test --all-features

63 changes: 63 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
ssh-key/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
 "signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down

74 changes: 63 additions & 11 deletions
ssh-key/src/cipher.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
 Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

 /// AES-256 in counter (CTR) mode.
 Aes256Ctr,

 /// AES-256 in Galois/Counter Mode (GCM).
 Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
 match ciphername {
 "none" => Ok(Self::None),
 AES256_CTR => Ok(Self::Aes256Ctr),
 AES256_GCM => Ok(Self::Aes256Gcm),
 _ => Err(Error::Algorithm),
 }
 }
Expand All@@ -48,6 +67,7 @@ impl Cipher {
 match self {
 Self::None => "none",
 Self::Aes256Ctr => AES256_CTR,
 Self::Aes256Gcm => AES256_GCM,
 }
 }

Expand All@@ -56,14 +76,15 @@ impl Cipher {
 match self {
 Self::None => None,
 Self::Aes256Ctr => Some((32, 16)),
 Self::Aes256Gcm => Some((32, 12)),
 }
 }

 /// Get the block size for this cipher in bytes.
 pub fn block_size(self) -> usize {
 match self {
 Self::None => 8,
 Self::Aes256Ctr => 16,
 Self::Aes256Ctr | Self::Aes256Gcm => 16,
 }
 }

Expand All@@ -77,6 +98,11 @@ impl Cipher {
 }
 }

 /// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
 pub fn has_tag(self) -> bool {
 matches!(self, Self::Aes256Gcm)
 }

 /// Is this cipher `none`?
 pub fn is_none(self) -> bool {
 self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

 /// Decrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
 match self {
 Self::None => return Err(Error::Crypto),
 // Counter mode encryption and decryption are the same operation
 Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
 }
 Self::Aes256Ctr => {
 if tag.is_some() {
 return Err(Error::Crypto);
 }

 // Counter mode encryption and decryption are the same operation
 self.encrypt(key, iv, buffer)?;
 Ok(())
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = tag.ok_or(Error::Crypto)?;
 cipher
 .decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(())
 }
 _ => Err(Error::Crypto),
 }
 }

 /// Encrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
 match self {
 Self::None => return Err(Error::Crypto),
 Self::Aes256Ctr => {
 let cipher = Aes256::new_from_slice(key)
 .and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
 cipher
 .try_apply_keystream_partial(buffer.into())
 .map_err(|_| Error::Crypto)?;

 Ok(None)
 }
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = cipher
 .encrypt_in_place_detached(&nonce.into(), &[], buffer)
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(Some(tag.into()))
 }
 _ => Err(Error::Crypto),
 }
 }
}

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ssh-key: initial `aes256-gcm@openssh.com` support by tarcieri · Pull Request #75 · RustCrypto/SSH · GitHub
Skip to content
ssh-key: initial aes256-gcm@openssh.com support#75

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: initial aes256-gcm@openssh.com support
#75
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


7 changes: 5 additions & 2 deletions
.github/workflows/ssh-key.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
 with:
 toolchain: ${{ matrix.rust }}
 - uses: RustCrypto/actions/cargo-hack-install@master
 - run: cargo hack test --feature-powerset --exclude-features default,std
 - run: cargo test
 - run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
 - run: cargo test --features aes-gcm
 - run: cargo test --features encryption
 - run: cargo test --features getrandom
 - run: cargo test --features std
 - run: cargo test --all-features

63 changes: 63 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
ssh-key/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
 "signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down

74 changes: 63 additions & 11 deletions
ssh-key/src/cipher.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
 Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

 /// AES-256 in counter (CTR) mode.
 Aes256Ctr,

 /// AES-256 in Galois/Counter Mode (GCM).
 Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
 match ciphername {
 "none" => Ok(Self::None),
 AES256_CTR => Ok(Self::Aes256Ctr),
 AES256_GCM => Ok(Self::Aes256Gcm),
 _ => Err(Error::Algorithm),
 }
 }
Expand All@@ -48,6 +67,7 @@ impl Cipher {
 match self {
 Self::None => "none",
 Self::Aes256Ctr => AES256_CTR,
 Self::Aes256Gcm => AES256_GCM,
 }
 }

Expand All@@ -56,14 +76,15 @@ impl Cipher {
 match self {
 Self::None => None,
 Self::Aes256Ctr => Some((32, 16)),
 Self::Aes256Gcm => Some((32, 12)),
 }
 }

 /// Get the block size for this cipher in bytes.
 pub fn block_size(self) -> usize {
 match self {
 Self::None => 8,
 Self::Aes256Ctr => 16,
 Self::Aes256Ctr | Self::Aes256Gcm => 16,
 }
 }

Expand All@@ -77,6 +98,11 @@ impl Cipher {
 }
 }

 /// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
 pub fn has_tag(self) -> bool {
 matches!(self, Self::Aes256Gcm)
 }

 /// Is this cipher `none`?
 pub fn is_none(self) -> bool {
 self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

 /// Decrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
 match self {
 Self::None => return Err(Error::Crypto),
 // Counter mode encryption and decryption are the same operation
 Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
 }
 Self::Aes256Ctr => {
 if tag.is_some() {
 return Err(Error::Crypto);
 }

 // Counter mode encryption and decryption are the same operation
 self.encrypt(key, iv, buffer)?;
 Ok(())
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = tag.ok_or(Error::Crypto)?;
 cipher
 .decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(())
 }
 _ => Err(Error::Crypto),
 }
 }

 /// Encrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
 match self {
 Self::None => return Err(Error::Crypto),
 Self::Aes256Ctr => {
 let cipher = Aes256::new_from_slice(key)
 .and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
 cipher
 .try_apply_keystream_partial(buffer.into())
 .map_err(|_| Error::Crypto)?;

 Ok(None)
 }
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = cipher
 .encrypt_in_place_detached(&nonce.into(), &[], buffer)
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(Some(tag.into()))
 }
 _ => Err(Error::Crypto),
 }
 }
}

Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

tarcieri
merged 1 commit into

from

Mar 7, 2023
 Merged


ssh-key: initial aes256-gcm@openssh.com support
#75
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


7 changes: 5 additions & 2 deletions
.github/workflows/ssh-key.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -84,6 +84,9 @@ jobs:
 with:
 toolchain: ${{ matrix.rust }}
 - uses: RustCrypto/actions/cargo-hack-install@master
 - run: cargo hack test --feature-powerset --exclude-features default,std
 - run: cargo test
 - run: cargo hack test --feature-powerset --exclude-features aes-gcm,default,encryption,getrandom,std
 - run: cargo test --features aes-gcm
 - run: cargo test --features encryption
 - run: cargo test --features getrandom
 - run: cargo test --features std
 - run: cargo test --all-features

63 changes: 63 additions & 0 deletions
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 2 additions & 0 deletions
ssh-key/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ zeroize = { version = "1", default-features = false }

# optional dependencies
aes = { version = "0.8", optional = true, default-features = false }
aes-gcm = { version = "0.10", optional = true, default-features = false, features = ["aes"] }
ctr = { version = "0.9", optional = true, default-features = false }
bcrypt-pbkdf = { version = "0.10", optional = true, default-features = false, features = ["alloc"] }
bigint = { package = "num-bigint-dig", version = "0.8", optional = true, default-features = false }
Expand DownExpand Up@@ -61,6 +62,7 @@ std = [
 "signature/std"
]

aes-gcm = ["dep:aes-gcm", "encryption"]
dsa = ["dep:bigint", "dep:dsa", "dep:sha1", "alloc", "signature/rand_core"]
ecdsa = ["dep:sec1"]
ed25519 = ["dep:ed25519-dalek", "rand_core"]
Expand Down

74 changes: 63 additions & 11 deletions
ssh-key/src/cipher.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,24 @@ use aes::{
 Aes256,
};

#[cfg(feature = "aes-gcm")]
use aes_gcm::{aead::AeadInPlace, Aes256Gcm};

/// AES-256 in counter (CTR) mode
const AES256_CTR: &str = "aes256-ctr";

/// AES-256 in Galois/Counter Mode (GCM).
const AES256_GCM: &str = "aes256-gcm@openssh.com";

/// Nonces for AEAD modes.
#[cfg(feature = "aes-gcm")]
type AeadNonce = [u8; 12];

/// Authentication tag for ciphertext data.
///
/// This is used by e.g. `aes256-gcm@openssh.com`
pub(crate) type Tag = [u8; 16];

/// Counter mode with a 32-bit big endian counter.
#[cfg(feature = "encryption")]
type Ctr128BE<Cipher> = ctr::CtrCore<Cipher, ctr::flavors::Ctr128BE>;
Expand All@@ -28,6 +43,9 @@ pub enum Cipher {

 /// AES-256 in counter (CTR) mode.
 Aes256Ctr,

 /// AES-256 in Galois/Counter Mode (GCM).
 Aes256Gcm,
}

impl Cipher {
Expand All@@ -39,6 +57,7 @@ impl Cipher {
 match ciphername {
 "none" => Ok(Self::None),
 AES256_CTR => Ok(Self::Aes256Ctr),
 AES256_GCM => Ok(Self::Aes256Gcm),
 _ => Err(Error::Algorithm),
 }
 }
Expand All@@ -48,6 +67,7 @@ impl Cipher {
 match self {
 Self::None => "none",
 Self::Aes256Ctr => AES256_CTR,
 Self::Aes256Gcm => AES256_GCM,
 }
 }

Expand All@@ -56,14 +76,15 @@ impl Cipher {
 match self {
 Self::None => None,
 Self::Aes256Ctr => Some((32, 16)),
 Self::Aes256Gcm => Some((32, 12)),
 }
 }

 /// Get the block size for this cipher in bytes.
 pub fn block_size(self) -> usize {
 match self {
 Self::None => 8,
 Self::Aes256Ctr => 16,
 Self::Aes256Ctr | Self::Aes256Gcm => 16,
 }
 }

Expand All@@ -77,6 +98,11 @@ impl Cipher {
 }
 }

 /// Does this cipher have an authentication tag? (i.e. is it an AEAD mode?)
 pub fn has_tag(self) -> bool {
 matches!(self, Self::Aes256Gcm)
 }

 /// Is this cipher `none`?
 pub fn is_none(self) -> bool {
 self == Self::None
Expand All@@ -89,21 +115,36 @@ impl Cipher {

 /// Decrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn decrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8], tag: Option<Tag>) -> Result<()> {
 match self {
 Self::None => return Err(Error::Crypto),
 // Counter mode encryption and decryption are the same operation
 Self::Aes256Ctr => self.encrypt(key, iv, buffer)?,
 }
 Self::Aes256Ctr => {
 if tag.is_some() {
 return Err(Error::Crypto);
 }

 // Counter mode encryption and decryption are the same operation
 self.encrypt(key, iv, buffer)?;
 Ok(())
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = tag.ok_or(Error::Crypto)?;
 cipher
 .decrypt_in_place_detached(&nonce.into(), &[], buffer, &tag.into())
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(())
 }
 _ => Err(Error::Crypto),
 }
 }

 /// Encrypt the ciphertext in the `buffer` in-place using this cipher.
 #[cfg(feature = "encryption")]
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<()> {
 pub fn encrypt(self, key: &[u8], iv: &[u8], buffer: &mut [u8]) -> Result<Option<Tag>> {
 match self {
 Self::None => return Err(Error::Crypto),
 Self::Aes256Ctr => {
 let cipher = Aes256::new_from_slice(key)
 .and_then(|aes| Ctr128BE::inner_iv_slice_init(aes, iv))
Expand All@@ -112,10 +153,21 @@ impl Cipher {
 cipher
 .try_apply_keystream_partial(buffer.into())
 .map_err(|_| Error::Crypto)?;

 Ok(None)
 }
 }
 #[cfg(feature = "aes-gcm")]
 Self::Aes256Gcm => {
 let cipher = Aes256Gcm::new_from_slice(key).map_err(|_| Error::Crypto)?;
 let nonce = AeadNonce::try_from(iv).map_err(|_| Error::Crypto)?;
 let tag = cipher
 .encrypt_in_place_detached(&nonce.into(), &[], buffer)
 .map_err(|_| Error::Crypto)?;

 Ok(())
 Ok(Some(tag.into()))
 }
 _ => Err(Error::Crypto),
 }
 }
}

Expand Down
Loading