@@ -128,7 +128,8 @@ KDFLIB_TESTS_ALIGN16 constexpr unsigned char kdf1_expected_key[] = {
128
128
0xff , 0xff , 0xff , 0xff , 0xff , 0xff , 0xff , 0xff ,
129
129
0xff , 0xff , 0xff , 0xff , 0xff , 0xff , 0xff , 0xff ,
130
130
0xef , 0xef , 0xef , 0xef , 0xef , 0xef , 0xef , 0xef ,
131
- 0xef , 0xef , 0xef , 0xef , 0xef , 0xef , 0xef , 0xef };
131
+ 0xef , 0xef , 0xef , 0xef , 0xef , 0xef , 0xef , 0xef
132
+ };
132
133
133
134
134
135
/* *
@@ -138,26 +139,29 @@ KDFLIB_TESTS_ALIGN16 constexpr unsigned char kdf2_expected_key[] = {
138
139
0xff , 0xfe , 0xfd , 0xfc , 0xfb , 0xfa , 0xf9 , 0xf8 ,
139
140
0xf7 , 0xf7 , 0xf5 , 0xf4 , 0xf3 , 0xf2 , 0xf1 , 0xf0 ,
140
141
0x00 , 0x01 , 0x02 , 0x03 , 0x04 , 0x05 , 0x06 , 0x07 ,
141
- 0x08 , 0x09 , 0x0a , 0x0b , 0x0c , 0x0d , 0x0e , 0x0f };
142
+ 0x08 , 0x09 , 0x0a , 0x0b , 0x0c , 0x0d , 0x0e , 0x0f
143
+ };
142
144
143
145
} // namespace test::r1323665_1_022_2018
144
146
145
147
146
148
147
149
TEST (R1323665_1_022_2018, Kdf1)
148
150
{
149
- KDFLIB_TESTS_ALIGN16 unsigned char key_buffer[sizeof (test::data::master_key)] = {0 };
151
+ KDFLIB_TESTS_ALIGN16 unsigned char key_buffer[sizeof (test::data::master_key)] = { 0 };
150
152
151
153
test::r1323665_1_022_2018::UserContext user_context = {
152
- .key_size = sizeof (key_buffer)};
154
+ .key_size = sizeof (key_buffer)
155
+ };
153
156
154
157
R1323665_1_022_2018_KDF1_CONTEXT kdf_context = {
155
158
.key_buffer = key_buffer,
156
159
.user_context = &user_context,
157
160
.initialize_key = test::r1323665_1_022_2018::initialize_key,
158
- .derive_key = test::r1323665_1_022_2018::derive_key};
161
+ .derive_key = test::r1323665_1_022_2018::derive_key
162
+ };
159
163
160
- KDFLIB_TESTS_ALIGN16 unsigned char key[sizeof (test::data::master_key)] = {0 };
164
+ KDFLIB_TESTS_ALIGN16 unsigned char key[sizeof (test::data::master_key)] = { 0 };
161
165
r1323665_1_022_2018_kdf1 (test::data::master_key, test::r1323665_1_022_2018::t,
162
166
&kdf_context, key);
163
167
@@ -168,12 +172,13 @@ TEST(R1323665_1_022_2018, Kdf1)
168
172
169
173
TEST (R1323665_1_022_2018, Kdf2)
170
174
{
171
- KDFLIB_TESTS_ALIGN16 unsigned char key_buffer[sizeof (test::data::master_key)] = {0 };
172
- KDFLIB_TESTS_ALIGN16 unsigned char format_buffer[sizeof (unsigned long long ) * 6 ] = {0 };
175
+ KDFLIB_TESTS_ALIGN16 unsigned char key_buffer[sizeof (test::data::master_key)] = { 0 };
176
+ KDFLIB_TESTS_ALIGN16 unsigned char format_buffer[sizeof (unsigned long long ) * 6 ] = { 0 };
173
177
174
178
test::r1323665_1_022_2018::UserContext user_context = {
175
179
.key_size = sizeof (key_buffer),
176
- .format_size = sizeof (format_buffer)};
180
+ .format_size = sizeof (format_buffer)
181
+ };
177
182
178
183
R1323665_1_022_2018_KDF2_CONTEXT kdf_context = {
179
184
.key_buffer = key_buffer,
@@ -182,9 +187,10 @@ TEST(R1323665_1_022_2018, Kdf2)
182
187
.user_context = &user_context,
183
188
.initialize_key = test::r1323665_1_022_2018::initialize_key,
184
189
.format = test::r1323665_1_022_2018::format,
185
- .mac = test::r1323665_1_022_2018::mac};
190
+ .mac = test::r1323665_1_022_2018::mac
191
+ };
186
192
187
- KDFLIB_TESTS_ALIGN16 unsigned char key[sizeof (test::data::master_key)] = {0 };
193
+ KDFLIB_TESTS_ALIGN16 unsigned char key[sizeof (test::data::master_key)] = { 0 };
188
194
r1323665_1_022_2018_kdf2 (test::data::master_key,
189
195
test::r1323665_1_022_2018::iv,
190
196
test::r1323665_1_022_2018::l,
0 commit comments