') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); chacha20: add XChaCha8 and XChaCha12 by PaulGrandperrin · Pull Request #215 · RustCrypto/stream-ciphers · GitHub
Skip to content

chacha20: add XChaCha8 and XChaCha12 - #215

Merged
tarcieri merged 4 commits into
RustCrypto:masterfrom
PaulGrandperrin:master
Jan 5, 2021
Merged

chacha20: add XChaCha8 and XChaCha12#215
tarcieri merged 4 commits into
RustCrypto:masterfrom
PaulGrandperrin:master

Conversation

@PaulGrandperrin

@PaulGrandperrinPaulGrandperrin commented Jan 5, 2021

Copy link
Copy Markdown
Contributor

The rationale mostly comes from:

There is probably some more doc to update to reflect the changes made to structures to make them more generic.
Also, it would probably make sense to rename the feature xchacha20 to xchacha.

See also cryptocorrosion/cryptocorrosion#42

@PaulGrandperrin
chacha20: add XChaCha8 and XChaCha12
05fa7c0
The rationale mostly comes from:
- ["Too Much Crypto" by Jean-Philippe Aumasson](https://eprint.iacr.org/2019/1492.pdf)
- The 7 round design of [Blake3](https://github.com/BLAKE3-team/BLAKE3-specs/blob/master/blake3.pdf)
- The 12 round design of [KangarooTwelve](https://keccak.team/kangarootwelve.html)
- Slide "Status of Keccak & KangarooTwelve cryptanalysis" (page 33) of those [slides](https://keccak.team/files/K12atACNS.pdf)
- The rationale in the [spec](https://keccak.team/files/KangarooTwelve.pdf)
@PaulGrandperrinPaulGrandperrin mentioned this pull request Jan 5, 2021
Merged
tarcieri
tarcieri approved these changes Jan 5, 2021
View reviewed changes

@tarcieritarcieri left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with renaming the feature to xchacha. Also if you'd like to do another pass over the rustdoc before merging let me know.

@PaulGrandperrin

PaulGrandperrin commented Jan 5, 2021

Copy link
Copy Markdown
ContributorAuthor

Ok, I'll do my best!

tarcieri
tarcieri reviewed Jan 5, 2021
View reviewed changes
Comment threadchacha20/Cargo.toml Outdated
"""
repository = "https://github.com/RustCrypto/stream-ciphers"
keywords = ["crypto", "stream-cipher", "chacha8", "chacha12", "xchacha20"]
keywords = ["crypto", "stream-cipher", "chacha8", "chacha12", "chacha20", "xchacha8", "xchacha12", "xchacha20"]

@tarcieritarcieriJan 5, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe there's a limit of 5 keywords enforced by crates.io

@tarcieri

tarcieri commented Jan 5, 2021

Copy link
Copy Markdown
Member

@PaulGrandperrin you'll need to edit .github/workflows/chacha20.yml and rename the xchacha20 feature there too.

Otherwise one nit about the keywords in Cargo.toml, but otherwise looks great, thanks for doing this!

@PaulGrandperrin

PaulGrandperrin commented Jan 5, 2021

Copy link
Copy Markdown
ContributorAuthor

I feel that this is ready now!
Also, I've been using lots of RustCrypto's crates lately and I would like to warmly thank you for your awesome work!

@tarcieri
tarcieri merged commit b014bfa into RustCrypto:masterJan 5, 2021
@tarcieri

tarcieri commented Jan 5, 2021

Copy link
Copy Markdown
Member

Merged, thank you!

tarcieri added a commit to RustCrypto/AEADs that referenced this pull request Jan 7, 2021
@tarcieri
chacha20poly1305: update xchacha feature name
b452ee7
RustCrypto/stream-ciphers#215
@tarcieritarcieri mentioned this pull request Jan 7, 2021
Merged
tarcieri added a commit to RustCrypto/AEADs that referenced this pull request Jan 7, 2021
@tarcieri
chacha20poly1305: updatexchachafeature name (#257)
1fc9377
RustCrypto/stream-ciphers#215
@tarcieritarcieri mentioned this pull request Apr 29, 2021
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tarcieritarcieritarcieri approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@PaulGrandperrin@tarcieri