@@ -7,25 +7,25 @@ use yescrypt::yescrypt_kdf;
7
7
#[ test]
8
8
fn kat0 ( ) {
9
9
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 "
12
12
) ;
13
13
let actual = yescrypt_kdf ( b"" , b"" , 0 , 16 , 1 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
14
14
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
15
15
}
16
16
17
17
#[ test]
18
18
fn kat1 ( ) {
19
- const EXPECTED : [ u8 ; 8 ] = hex ! ( "77 d6 57 62 38 65 7b 20 " ) ;
19
+ const EXPECTED : [ u8 ; 8 ] = hex ! ( "77d6576238657b20 " ) ;
20
20
let actual = yescrypt_kdf ( b"" , b"" , 0 , 16 , 1 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
21
21
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
22
22
}
23
23
24
24
#[ test]
25
25
fn kat2 ( ) {
26
26
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 "
29
29
) ;
30
30
let actual = yescrypt_kdf ( b"" , b"" , 0 , 4 , 1 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
31
31
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
@@ -34,25 +34,25 @@ fn kat2() {
34
34
#[ test]
35
35
fn kat3 ( ) {
36
36
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 "
39
39
) ;
40
40
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
41
41
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
42
42
}
43
43
44
44
#[ test]
45
45
fn kat4 ( ) {
46
- const EXPECTED : [ u8 ; 8 ] = hex ! ( "85 dd a4 8c 9e c9 de 2f " ) ;
46
+ const EXPECTED : [ u8 ; 8 ] = hex ! ( "85dda48c9ec9de2f " ) ;
47
47
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
48
48
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
49
49
}
50
50
51
51
#[ test]
52
52
fn kat5 ( ) {
53
53
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 "
56
56
) ;
57
57
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 1 , 0 , EXPECTED . len ( ) ) ;
58
58
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
@@ -61,8 +61,8 @@ fn kat5() {
61
61
#[ test]
62
62
fn kat6 ( ) {
63
63
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 "
66
66
) ;
67
67
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 2 , 0 , EXPECTED . len ( ) ) ;
68
68
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
@@ -71,36 +71,33 @@ fn kat6() {
71
71
#[ test]
72
72
fn kat7 ( ) {
73
73
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 "
76
76
) ;
77
77
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 3 , 0 , EXPECTED . len ( ) ) ;
78
78
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
79
79
}
80
80
81
81
#[ test]
82
82
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" ) ;
86
85
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 3 , 0 , EXPECTED . len ( ) ) ;
87
86
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
88
87
}
89
88
90
89
#[ test]
91
90
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" ) ;
95
93
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 3 , 0 , EXPECTED . len ( ) ) ;
96
94
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
97
95
}
98
96
99
97
#[ test]
100
98
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" ) ;
104
101
let actual = yescrypt_kdf ( b"" , b"" , 1 , 4 , 1 , 1 , 3 , 0 , EXPECTED . len ( ) ) ;
105
102
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
106
103
}
@@ -115,53 +112,50 @@ fn kat11() {
115
112
#[ test]
116
113
fn kat12 ( ) {
117
114
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 "
120
117
) ;
121
118
let actual = yescrypt_kdf ( b"" , b"" , 182 , 4 , 1 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
122
119
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
123
120
}
124
121
125
122
#[ test]
126
123
fn kat13 ( ) {
127
- const EXPECTED : [ u8 ; 4 ] = hex ! ( "0c d5 af 76 " ) ;
124
+ const EXPECTED : [ u8 ; 4 ] = hex ! ( "0cd5af76 " ) ;
128
125
let actual = yescrypt_kdf ( b"" , b"" , 182 , 4 , 1 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
129
126
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
130
127
}
131
128
132
129
#[ test]
133
130
fn kat14 ( ) {
134
131
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 "
137
134
) ;
138
135
let actual = yescrypt_kdf ( b"" , b"" , 182 , 4 , 1 , 1 , 1 , 0 , EXPECTED . len ( ) ) ;
139
136
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
140
137
}
141
138
142
139
#[ test]
143
140
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" ) ;
147
143
let actual = yescrypt_kdf ( b"" , b"" , 182 , 4 , 1 , 1 , 1 , 0 , EXPECTED . len ( ) ) ;
148
144
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
149
145
}
150
146
151
147
#[ test]
152
148
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" ) ;
156
151
let actual = yescrypt_kdf ( b"" , b"" , 182 , 4 , 1 , 1 , 1 , 0 , EXPECTED . len ( ) ) ;
157
152
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
158
153
}
159
154
160
155
#[ test]
161
156
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" ) ;
165
159
let actual = yescrypt_kdf ( b"" , b"" , 182 , 4 , 1 , 1 , 1 , 0 , EXPECTED . len ( ) ) ;
166
160
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
167
161
}
@@ -175,52 +169,47 @@ fn kat18() {
175
169
176
170
#[ test]
177
171
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" ) ;
181
174
let actual = yescrypt_kdf ( b"p" , b"s" , 182 , 16 , 8 , 1 , 10 , 0 , EXPECTED . len ( ) ) ;
182
175
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
183
176
}
184
177
185
178
#[ test]
186
179
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" ) ;
190
182
let actual = yescrypt_kdf ( b"p" , b"s" , 1 , 16 , 8 , 1 , 10 , 0 , EXPECTED . len ( ) ) ;
191
183
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
192
184
}
193
185
194
186
#[ test]
195
187
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" ) ;
199
190
let actual = yescrypt_kdf ( b"p" , b"s" , 182 , 16 , 8 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
200
191
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
201
192
}
202
193
203
194
#[ test]
204
195
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" ) ;
208
198
let actual = yescrypt_kdf ( b"p" , b"s" , 1 , 16 , 8 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
209
199
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
210
200
}
211
201
212
202
#[ test]
213
203
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" ) ;
217
206
let actual = yescrypt_kdf ( b"p" , b"s" , 182 , 16 , 8 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
218
207
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
219
208
}
220
209
221
210
#[ test]
222
211
fn kat24 ( ) {
223
- const EXPECTED : [ u8 ; 8 ] = hex ! ( "c8 c7 ff 11 22 b0 b2 91 " ) ;
212
+ const EXPECTED : [ u8 ; 8 ] = hex ! ( "c8c7ff1122b0b291 " ) ;
224
213
let actual = yescrypt_kdf ( b"p" , b"s" , 182 , 16 , 8 , 1 , 0 , 0 , EXPECTED . len ( ) ) ;
225
214
assert_eq ! ( EXPECTED . as_slice( ) , actual. as_slice( ) ) ;
226
215
}
0 commit comments