Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri
, '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" + '
Expose AesGcm bits necessary to build a constant time decrypt by xoloki · Pull Request #188 · RustCrypto/AEADs · GitHub
Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri
, '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('^' + ".*" + ' Expose AesGcm bits necessary to build a constant time decrypt by xoloki · Pull Request #188 · RustCrypto/AEADs · GitHub
Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri
, '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('^' + ".*" + ' Expose AesGcm bits necessary to build a constant time decrypt by xoloki · Pull Request #188 · RustCrypto/AEADs · GitHub
Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri
, '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" + ' Expose AesGcm bits necessary to build a constant time decrypt by xoloki · Pull Request #188 · RustCrypto/AEADs · GitHub
Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri
, '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('^' + ".*" + ' Expose AesGcm bits necessary to build a constant time decrypt by xoloki · Pull Request #188 · RustCrypto/AEADs · GitHub
Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri
, '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('^' + ".*" + ' Expose AesGcm bits necessary to build a constant time decrypt by xoloki · Pull Request #188 · RustCrypto/AEADs · GitHub
Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri
, '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); } })(); })(); Expose AesGcm bits necessary to build a constant time decrypt by xoloki · Pull Request #188 · RustCrypto/AEADs · GitHub
Skip to content

Expose AesGcm bits necessary to build a constant time decrypt - #188

Closed
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub
Closed

Expose AesGcm bits necessary to build a constant time decrypt#188
xoloki wants to merge 2 commits into
RustCrypto:masterfrom
xoloki:aes-gcm-pub

Conversation

@xoloki

Copy link
Copy Markdown

As discussed in #184, aes-gcm decrypt is not constant time. @tarcieri suggested that for our use case, it would be better to build a custom crate rather than put a constant time decrypt in the base repo, since overwriting the buffer if the mac check fails is necessary to avoid leaking information.

We attempted to build a constant time decrypt module without duplicating the entire aes-gcm crate; unfortunately, the AesGcm struct does not allow access to the critical data and functions. So I'm offering this PR, which simply makes one struct field and two functions pub.

@tarcieri

Copy link
Copy Markdown
Member

I'd be okay with moving Ctr32 somewhere it can be pub, possibly the ctr crate (it could be unified with the Ctr32 used by AES-GCM-SIV, which is effectively the same thing, but little endian).

I'm somewhat reluctant to expose methods like init_ctr and compute_tag though, as these are effectively internals of the implementation.

@tarcieritarcieri mentioned this pull request Aug 18, 2020
@tarcieri

Copy link
Copy Markdown
Member

See this comment re: extracting Ctr32 into the ctr crate:

RustCrypto/stream-ciphers#41

If you had that, would you be okay with duplicating the rest of the crate? Especially if you went back to a slightly earlier version of aes-gcm before support for variable-sized nonces was added, the bulk of the remaining implementation is ~80 LOC, much of which I imagine you'd want to customize to get the behavior you desire:

AEADs/aes-gcm/src/lib.rs

Lines 181 to 254 in 5a28e70

impl<B>AeadforAesGcm<B>
where
B:BlockCipher<BlockSize = U16>,
B::ParBlocks:ArrayLength<GenericArray<u8,B::BlockSize>>,
{
typeNonceSize = U12;
typeTagSize = U16;
typeCiphertextOverhead = U0;
fnencrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
) -> Result<Tag,Error>{
if buffer.len()asu64 > P_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut ctr = Ctr32::new(nonce);
ctr.seek(1);
ctr.apply_keystream(&self.cipher, buffer);
letmut tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
ctr.seek(0);
ctr.apply_keystream(&self.cipher, tag.as_mut_slice());
Ok(tag)
}
fndecrypt_in_place_detached(
&self,
nonce:&GenericArray<u8,Self::NonceSize>,
associated_data:&[u8],
buffer:&mut[u8],
tag:&Tag,
) -> Result<(),Error>{
if buffer.len()asu64 > C_MAX || associated_data.len()asu64 > A_MAX{
returnErr(Error);
}
// TODO(tarcieri): interleave encryption with GHASH
// See: <https://github.com/RustCrypto/AEADs/issues/74>
letmut expected_tag = compute_tag(&mutself.ghash.clone(), associated_data, buffer);
letmut ctr = Ctr32::new(nonce);
ctr.apply_keystream(&self.cipher, expected_tag.as_mut_slice());
use subtle::ConstantTimeEq;
if expected_tag.ct_eq(&tag).unwrap_u8() == 1{
ctr.apply_keystream(&self.cipher, buffer);
Ok(())
}else{
Err(Error)
}
}
}
/// Authenticate the given plaintext and associated data using GHASH
fncompute_tag(ghash:&mutGHash,associated_data:&[u8],buffer:&[u8]) -> Tag{
ghash.update_padded(associated_data);
ghash.update_padded(buffer);
let associated_data_bits = (associated_data.len()asu64)*8;
let buffer_bits = (buffer.len()asu64)*8;
letmut block = GenericArray::default();
block[..8].copy_from_slice(&associated_data_bits.to_be_bytes());
block[8..].copy_from_slice(&buffer_bits.to_be_bytes());
ghash.update_block(&block);
ghash.result_reset().into_bytes()
}

@xoloki

Copy link
Copy Markdown
Author

If you had that, would you be okay with duplicating the rest of the crate?

Yeah that's cool, thanks!

@tarcieri

Copy link
Copy Markdown
Member

PR to extract Ctr32 into the ctr crate (as Ctr32BE):

RustCrypto/stream-ciphers#170

If that's sufficient and you can do the rest yourselves in a 3rd party crate, I'll go ahead and close this.

@tarcieri

Copy link
Copy Markdown
Member

Note: in ctr v0.6.0-pre, there's now Ctr32BE: https://docs.rs/ctr/0.6.0-pre/ctr/struct.Ctr32BE.html

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@xoloki@tarcieri