Skip to content

Commit 4ac0ef5

Browse files
authored
ci: add typos job (#615)
1 parent 7712803 commit 4ac0ef5

File tree

4 files changed

+69
-56
lines changed

4 files changed

+69
-56
lines changed

.github/workflows/workspace.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,9 @@ jobs:
3030
toolchain: stable
3131
components: rustfmt
3232
- run: cargo fmt --all -- --check
33+
34+
typos:
35+
runs-on: ubuntu-latest
36+
steps:
37+
- uses: actions/checkout@v4
38+
- uses: crate-ci/typos@v1

.typos.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[files]
2+
extend-exclude = [
3+
".git/"
4+
]
5+
6+
[default]
7+
extend-ignore-re = [
8+
# Patterns which appear to be 36 or more characters of Base64/Base64url
9+
'\b[0-9A-Za-z+/]{36,}\b',
10+
'\b[0-9A-Za-z_-]{36,}\b',
11+
# KAT in argon2
12+
'\b34 71 9f ba d2 22 61 33 7b 2b 55 29 81 44 09 af\b',
13+
]
14+
15+
[default.extend-words]
16+
"GOST" = "GOST"
17+
# Variable name in yescrypt
18+
"clen" = "clen"

argon2/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,17 +432,17 @@ impl<'key> Argon2<'key> {
432432
for block in first_block..segment_length {
433433
// Extract entropy
434434
let rand = if data_independent_addressing {
435-
let addres_index = block % ADDRESSES_IN_BLOCK;
435+
let address_index = block % ADDRESSES_IN_BLOCK;
436436

437-
if addres_index == 0 {
437+
if address_index == 0 {
438438
self.update_address_block(
439439
&mut address_block,
440440
&mut input_block,
441441
&zero_block,
442442
);
443443
}
444444

445-
address_block.as_ref()[addres_index]
445+
address_block.as_ref()[address_index]
446446
} else {
447447
memory_blocks[prev_index].as_ref()[0]
448448
};

yescrypt/tests/kats.rs

Lines changed: 42 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ use yescrypt::yescrypt_kdf;
77
#[test]
88
fn kat0() {
99
const EXPECTED: [u8; 64] = hex!(
10-
"77 d6 57 62 38 65 7b 20 3b 19 ca 42 c1 8a 04 97 f1 6b 48 44 e3 07 4a e8 df df fa 3f ed e2 14 42"
11-
"fc d0 06 9d ed 09 48 f8 32 6a 75 3a 0f c8 1f 17 e8 d3 e0 fb 2e 0d 36 28 cf 35 e2 0c 38 d1 89 06"
10+
"77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442"
11+
"fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906"
1212
);
1313
let actual = yescrypt_kdf(b"", b"", 0, 16, 1, 1, 0, 0, EXPECTED.len());
1414
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
1515
}
1616

1717
#[test]
1818
fn kat1() {
19-
const EXPECTED: [u8; 8] = hex!("77 d6 57 62 38 65 7b 20");
19+
const EXPECTED: [u8; 8] = hex!("77d6576238657b20");
2020
let actual = yescrypt_kdf(b"", b"", 0, 16, 1, 1, 0, 0, EXPECTED.len());
2121
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
2222
}
2323

2424
#[test]
2525
fn kat2() {
2626
const EXPECTED: [u8; 64] = hex!(
27-
"ef ad 0c 23 31 4c b5 72 bc 3c fb 15 43 da 42 f8 a8 b0 73 00 4c 86 6b 64 ab 50 55 a4 f0 9f a5 f5"
28-
"71 14 2e bf e7 e0 5a 3b 92 c4 32 f3 1d ea 95 ad 5f 9c 85 4b 64 56 46 2f 4b d0 f7 32 b7 cd c5 49"
27+
"efad0c23314cb572bc3cfb1543da42f8a8b073004c866b64ab5055a4f09fa5f5"
28+
"71142ebfe7e05a3b92c432f31dea95ad5f9c854b6456462f4bd0f732b7cdc549"
2929
);
3030
let actual = yescrypt_kdf(b"", b"", 0, 4, 1, 1, 0, 0, EXPECTED.len());
3131
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
@@ -34,25 +34,25 @@ fn kat2() {
3434
#[test]
3535
fn kat3() {
3636
const EXPECTED: [u8; 64] = hex!(
37-
"85 dd a4 8c 9e c9 de 2f 7f 1a e8 b4 df ed a5 1f 8b 6d 56 f3 08 1b e1 a7 c0 83 3b a2 71 9a 36 ab"
38-
"02 88 5d ae 36 55 7d 34 26 86 b1 7b a7 5f 2c 21 77 92 de 09 70 ab 1d 07 a9 c7 50 93 6d 31 42 6f"
37+
"85dda48c9ec9de2f7f1ae8b4dfeda51f8b6d56f3081be1a7c0833ba2719a36ab"
38+
"02885dae36557d342686b17ba75f2c217792de0970ab1d07a9c750936d31426f"
3939
);
4040
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 0, 0, EXPECTED.len());
4141
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
4242
}
4343

4444
#[test]
4545
fn kat4() {
46-
const EXPECTED: [u8; 8] = hex!("85 dd a4 8c 9e c9 de 2f");
46+
const EXPECTED: [u8; 8] = hex!("85dda48c9ec9de2f");
4747
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 0, 0, EXPECTED.len());
4848
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
4949
}
5050

5151
#[test]
5252
fn kat5() {
5353
const EXPECTED: [u8; 64] = hex!(
54-
"4b aa 8c d8 60 8b a9 1f 3e 34 39 d9 ec 4f ae 8f 9f c0 92 d9 ca 22 b7 37 7e 31 ae 5b 9a d7 87 7c"
55-
"11 68 69 11 62 dd 0e 5e f0 49 e5 70 65 0c be d4 38 4a d6 05 34 fb 0c be d1 9f f3 f0 33 c9 4b 0c"
54+
"4baa8cd8608ba91f3e3439d9ec4fae8f9fc092d9ca22b7377e31ae5b9ad7877c"
55+
"1168691162dd0e5ef049e570650cbed4384ad60534fb0cbed19ff3f033c94b0c"
5656
);
5757
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 1, 0, EXPECTED.len());
5858
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
@@ -61,8 +61,8 @@ fn kat5() {
6161
#[test]
6262
fn kat6() {
6363
const EXPECTED: [u8; 64] = hex!(
64-
"e6 e8 bb a0 9b 64 12 ff b0 b3 cc 35 e3 7d 0b 78 2a 47 fb aa dc 57 a0 76 d7 c6 cc 2e 70 91 9a 1b"
65-
"8d 47 38 c4 f8 33 55 69 07 42 d9 be d7 1c 3b 8f b0 d7 eb 08 6a b1 34 c5 e5 57 07 c2 c1 3c 75 ef"
64+
"e6e8bba09b6412ffb0b3cc35e37d0b782a47fbaadc57a076d7c6cc2e70919a1b"
65+
"8d4738c4f83355690742d9bed71c3b8fb0d7eb086ab134c5e55707c2c13c75ef"
6666
);
6767
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 2, 0, EXPECTED.len());
6868
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
@@ -71,36 +71,33 @@ fn kat6() {
7171
#[test]
7272
fn kat7() {
7373
const EXPECTED: [u8; 64] = hex!(
74-
"ac d9 a4 20 1c f4 a4 76 ec f7 ba a6 11 3d 86 fb 65 cd 07 10 2b 40 04 e4 f9 d9 9c d3 42 55 a1 08"
75-
"99 7d 70 ae 0a 64 bf 0a 4d 96 c1 73 ab f8 82 79 c1 a9 4a d9 bd f1 68 ed fb bd 90 f6 6e d5 c8 0d"
74+
"acd9a4201cf4a476ecf7baa6113d86fb65cd07102b4004e4f9d99cd34255a108"
75+
"997d70ae0a64bf0a4d96c173abf88279c1a94ad9bdf168edfbbd90f66ed5c80d"
7676
);
7777
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 3, 0, EXPECTED.len());
7878
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
7979
}
8080

8181
#[test]
8282
fn kat8() {
83-
const EXPECTED: [u8; 33] = hex!(
84-
"ac d9 a4 20 1c f4 a4 76 ec f7 ba a6 11 3d 86 fb 65 cd 07 10 2b 40 04 e4 f9 d9 9c d3 42 55 a1 08 99"
85-
);
83+
const EXPECTED: [u8; 33] =
84+
hex!("acd9a4201cf4a476ecf7baa6113d86fb65cd07102b4004e4f9d99cd34255a10899");
8685
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 3, 0, EXPECTED.len());
8786
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
8887
}
8988

9089
#[test]
9190
fn kat9() {
92-
const EXPECTED: [u8; 32] = hex!(
93-
"ac d9 a4 20 1c f4 a4 76 ec f7 ba a6 11 3d 86 fb 65 cd 07 10 2b 40 04 e4 f9 d9 9c d3 42 55 a1 08"
94-
);
91+
const EXPECTED: [u8; 32] =
92+
hex!("acd9a4201cf4a476ecf7baa6113d86fb65cd07102b4004e4f9d99cd34255a108");
9593
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 3, 0, EXPECTED.len());
9694
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
9795
}
9896

9997
#[test]
10098
fn kat10() {
101-
const EXPECTED: [u8; 31] = hex!(
102-
"ac d9 a4 20 1c f4 a4 76 ec f7 ba a6 11 3d 86 fb 65 cd 07 10 2b 40 04 e4 f9 d9 9c d3 42 55 a1"
103-
);
99+
const EXPECTED: [u8; 31] =
100+
hex!("acd9a4201cf4a476ecf7baa6113d86fb65cd07102b4004e4f9d99cd34255a1");
104101
let actual = yescrypt_kdf(b"", b"", 1, 4, 1, 1, 3, 0, EXPECTED.len());
105102
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
106103
}
@@ -115,53 +112,50 @@ fn kat11() {
115112
#[test]
116113
fn kat12() {
117114
const EXPECTED: [u8; 64] = hex!(
118-
"0c d5 af 76 eb 24 1d f8 11 9a 9a 12 2a e3 69 20 bc c7 f4 14 b9 c0 d5 8f 45 00 80 60 da de 46 b0"
119-
"c8 09 22 bd cc 16 a3 ab 5d 20 1d 4c 61 40 c6 71 be 1f 75 27 2c a9 04 73 9d 5a d1 ff 67 2b 0c 21"
115+
"0cd5af76eb241df8119a9a122ae36920bcc7f414b9c0d58f45008060dade46b0"
116+
"c80922bdcc16a3ab5d201d4c6140c671be1f75272ca904739d5ad1ff672b0c21"
120117
);
121118
let actual = yescrypt_kdf(b"", b"", 182, 4, 1, 1, 0, 0, EXPECTED.len());
122119
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
123120
}
124121

125122
#[test]
126123
fn kat13() {
127-
const EXPECTED: [u8; 4] = hex!("0c d5 af 76");
124+
const EXPECTED: [u8; 4] = hex!("0cd5af76");
128125
let actual = yescrypt_kdf(b"", b"", 182, 4, 1, 1, 0, 0, EXPECTED.len());
129126
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
130127
}
131128

132129
#[test]
133130
fn kat14() {
134131
const EXPECTED: [u8; 64] = hex!(
135-
"23 b6 ad f0 b6 0c 9a 99 7f 58 58 3d 80 cd a4 8c 63 8c dc 2f 28 9e df 93 a7 08 07 72 5a 0d 35 c4"
136-
"68 ca 36 2c 55 57 cc 04 b6 81 1e 2e 73 08 41 f5 26 d8 f4 f7 ac fb fa 9e 06 fe 1f 38 3a 71 15 5e"
132+
"23b6adf0b60c9a997f58583d80cda48c638cdc2f289edf93a70807725a0d35c4"
133+
"68ca362c5557cc04b6811e2e730841f526d8f4f7acfbfa9e06fe1f383a71155e"
137134
);
138135
let actual = yescrypt_kdf(b"", b"", 182, 4, 1, 1, 1, 0, EXPECTED.len());
139136
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
140137
}
141138

142139
#[test]
143140
fn kat15() {
144-
const EXPECTED: [u8; 33] = hex!(
145-
"23 b6 ad f0 b6 0c 9a 99 7f 58 58 3d 80 cd a4 8c 63 8c dc 2f 28 9e df 93 a7 08 07 72 5a 0d 35 c4 68"
146-
);
141+
const EXPECTED: [u8; 33] =
142+
hex!("23b6adf0b60c9a997f58583d80cda48c638cdc2f289edf93a70807725a0d35c468");
147143
let actual = yescrypt_kdf(b"", b"", 182, 4, 1, 1, 1, 0, EXPECTED.len());
148144
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
149145
}
150146

151147
#[test]
152148
fn kat16() {
153-
const EXPECTED: [u8; 32] = hex!(
154-
"23 b6 ad f0 b6 0c 9a 99 7f 58 58 3d 80 cd a4 8c 63 8c dc 2f 28 9e df 93 a7 08 07 72 5a 0d 35 c4"
155-
);
149+
const EXPECTED: [u8; 32] =
150+
hex!("23b6adf0b60c9a997f58583d80cda48c638cdc2f289edf93a70807725a0d35c4");
156151
let actual = yescrypt_kdf(b"", b"", 182, 4, 1, 1, 1, 0, EXPECTED.len());
157152
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
158153
}
159154

160155
#[test]
161156
fn kat17() {
162-
const EXPECTED: [u8; 31] = hex!(
163-
"23 b6 ad f0 b6 0c 9a 99 7f 58 58 3d 80 cd a4 8c 63 8c dc 2f 28 9e df 93 a7 08 07 72 5a 0d 35"
164-
);
157+
const EXPECTED: [u8; 31] =
158+
hex!("23b6adf0b60c9a997f58583d80cda48c638cdc2f289edf93a70807725a0d35");
165159
let actual = yescrypt_kdf(b"", b"", 182, 4, 1, 1, 1, 0, EXPECTED.len());
166160
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
167161
}
@@ -175,52 +169,47 @@ fn kat18() {
175169

176170
#[test]
177171
fn kat19() {
178-
const EXPECTED: [u8; 40] = hex!(
179-
"e1 f9 81 73 3a 94 05 2f cd 7a cb 14 05 df 0b bd e8 e4 99 b6 a1 33 1b 77 59 09 b4 8c 2f 51 6c 40 dc c8 30 16 35 b7 23 7b"
180-
);
172+
const EXPECTED: [u8; 40] =
173+
hex!("e1f981733a94052fcd7acb1405df0bbde8e499b6a1331b775909b48c2f516c40dcc8301635b7237b");
181174
let actual = yescrypt_kdf(b"p", b"s", 182, 16, 8, 1, 10, 0, EXPECTED.len());
182175
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
183176
}
184177

185178
#[test]
186179
fn kat20() {
187-
const EXPECTED: [u8; 40] = hex!(
188-
"9e 7a 40 97 64 42 84 cf 3b 73 b6 04 50 ff 23 0c dc b6 b1 b1 9b 15 09 ee b4 82 f6 96 c4 f1 c7 05 c0 0f 74 02 16 18 3a 12"
189-
);
180+
const EXPECTED: [u8; 40] =
181+
hex!("9e7a4097644284cf3b73b60450ff230cdcb6b1b19b1509eeb482f696c4f1c705c00f740216183a12");
190182
let actual = yescrypt_kdf(b"p", b"s", 1, 16, 8, 1, 10, 0, EXPECTED.len());
191183
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
192184
}
193185

194186
#[test]
195187
fn kat21() {
196-
const EXPECTED: [u8; 40] = hex!(
197-
"c8 c7 ff 11 22 b0 b2 91 c3 f2 60 89 48 78 2c d6 89 cc 45 57 90 17 aa a5 ff 8b aa 74 a6 32 ec 99 c3 d6 69 30 fb 20 23 bb"
198-
);
188+
const EXPECTED: [u8; 40] =
189+
hex!("c8c7ff1122b0b291c3f2608948782cd689cc45579017aaa5ff8baa74a632ec99c3d66930fb2023bb");
199190
let actual = yescrypt_kdf(b"p", b"s", 182, 16, 8, 1, 0, 0, EXPECTED.len());
200191
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
201192
}
202193

203194
#[test]
204195
fn kat22() {
205-
const EXPECTED: [u8; 40] = hex!(
206-
"9d d6 36 c2 d0 bb 92 34 52 86 ef da f8 a6 8c fc 1b 4f fd c4 b1 ad ac cc 7d 86 4b 9a 67 87 b8 5d 6a e0 f5 28 0d a8 88 9f"
207-
);
196+
const EXPECTED: [u8; 40] =
197+
hex!("9dd636c2d0bb92345286efdaf8a68cfc1b4ffdc4b1adaccc7d864b9a6787b85d6ae0f5280da8889f");
208198
let actual = yescrypt_kdf(b"p", b"s", 1, 16, 8, 1, 0, 0, EXPECTED.len());
209199
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
210200
}
211201

212202
#[test]
213203
fn kat23() {
214-
const EXPECTED: [u8; 32] = hex!(
215-
"c8 c7 ff 11 22 b0 b2 91 c3 f2 60 89 48 78 2c d6 89 cc 45 57 90 17 aa a5 ff 8b aa 74 a6 32 ec 99"
216-
);
204+
const EXPECTED: [u8; 32] =
205+
hex!("c8c7ff1122b0b291c3f2608948782cd689cc45579017aaa5ff8baa74a632ec99");
217206
let actual = yescrypt_kdf(b"p", b"s", 182, 16, 8, 1, 0, 0, EXPECTED.len());
218207
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
219208
}
220209

221210
#[test]
222211
fn kat24() {
223-
const EXPECTED: [u8; 8] = hex!("c8 c7 ff 11 22 b0 b2 91");
212+
const EXPECTED: [u8; 8] = hex!("c8c7ff1122b0b291");
224213
let actual = yescrypt_kdf(b"p", b"s", 182, 16, 8, 1, 0, 0, EXPECTED.len());
225214
assert_eq!(EXPECTED.as_slice(), actual.as_slice());
226215
}

0 commit comments

Comments
 (0)