Skip to content

Commit 46d6a01

Browse files
eternal-flame-ADeternal-flame-AD
committed
Merge branch 'master' into scrypt-sse2
Signed-off-by: eternal-flame-AD <[email protected]>
2 parents 304da78 + 4ff18e9 commit 46d6a01

File tree

20 files changed

+569
-728
lines changed

20 files changed

+569
-728
lines changed

‎.typos.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ extend-ignore-re = [
1010
'\b[0-9A-Za-z_-]{36,}\b',
1111
# KAT in argon2
1212
'\b34 71 9f ba d2 22 61 33 7b 2b 55 29 81 44 09 af\b',
13+
# KAT in pbkdf2
14+
'\bpasswordPASSWORDpassword\b',
1315
]
1416

1517
[default.extend-words]

‎Cargo.lock‎

Lines changed: 57 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎argon2/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![no_std]
2-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
2+
#![cfg_attr(docsrs, feature(doc_cfg))]
33
#![doc = include_str!("../README.md")]
44
#![doc(
55
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",

‎balloon-hash/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![no_std]
2-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
2+
#![cfg_attr(docsrs, feature(doc_cfg))]
33
#![doc = include_str!("../README.md")]
44
#![doc(
55
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",

‎password-auth/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![no_std]
2-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
2+
#![cfg_attr(docsrs, feature(doc_cfg))]
33
#![doc = include_str!("../README.md")]
44
#![doc(
55
html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",

0 commit comments

Comments
 (0)