') + ')', '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); } })(); })(); pbkdf2: add new wrapper functions by newpavlov · Pull Request #337 · RustCrypto/password-hashes · GitHub
Skip to content

pbkdf2: add new wrapper functions - #337

Merged
newpavlov merged 2 commits into
masterfrom
hmac_new_api
Sep 13, 2022
Merged

pbkdf2: add new wrapper functions#337
newpavlov merged 2 commits into
masterfrom
hmac_new_api

Conversation

@newpavlov

@newpavlovnewpavlov commented Aug 30, 2022•
edited
Loading

Copy link
Copy Markdown
Member

The ugly bounds on the HMAC functions can be improved by resolving RustCrypto/MACs#104.

Closes#335.

@newpavlovnewpavlov changed the title hmac: add new wrapper functionspbkdf2: add new wrapper functionsAug 30, 2022
@newpavlovnewpavlov mentioned this pull request Aug 31, 2022
Closed
tarcieri
tarcieri reviewed Sep 6, 2022
View reviewed changes
Comment threadpbkdf2/src/lib.rs
/// use sha2::Sha256;
///
/// let res = pbkdf2_array::<Hmac<Sha256>, 20>(b"password", b"salt", 4096)
/// .expect("HMAC can be initialized with any key length");

@tarcieritarcieriSep 6, 2022•
edited
Loading

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.

FWIW I've been trying to eliminate the usages of expect in documentation going forward, although the boilerplate to do so is a bit onerous:

#![cfg_attr(feature = "std", doc = "```")]#![cfg_attr(not(feature = "std"), doc = "```ignore")]//! # fn main() -> Result<(), Box<dyn std::error::Error>> {//! let res = pbkdf2_array::<Hmac<Sha256>, 20>(b"password", b"salt", 4096)?;//! # Ok(())//! # }//! ```

@newpavlovnewpavlovSep 6, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I think expect in this case is preferred to the error bubbling since the panic never will be triggered.

@tarcieri

tarcieri commented Sep 6, 2022

Copy link
Copy Markdown
Member

Looks like Cargo.lock needs updated but otherwise this seems really helpful!

@newpavlov
newpavlov merged commit bf90bb7 into masterSep 13, 2022
@newpavlov
newpavlov deleted the hmac_new_api branch September 13, 2022 04:13
@tarcieritarcieri mentioned this pull request Mar 5, 2023
Merged
@yubiuseryubiuser mentioned this pull request Apr 1, 2023
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.

add a convenient way for common pbkdf2::<Hmac<Sha1>>(*** )

2 participants

@newpavlov@tarcieri