@@ -168,15 +168,17 @@ bool HandleOption(const char * progName, OptionSet * optSet, int id, const char
168
168
169
169
case ' i' :
170
170
if (!ParseInt (arg, gIterationCount ) ||
171
- !(gIterationCount >= chip::kPBKDFMinimumIterations && gIterationCount <= chip::kPBKDFMaximumIterations ))
171
+ !(gIterationCount >= chip::Crypto::kSpake2pPBKDFMinimumIterations &&
172
+ gIterationCount <= chip::Crypto::kSpake2pPBKDFMaximumIterations ))
172
173
{
173
174
PrintArgError (" %s: Invalid value specified for the iteration-count parameter: %s\n " , progName, arg);
174
175
return false ;
175
176
}
176
177
break ;
177
178
178
179
case ' l' :
179
- if (!ParseInt (arg, gSaltLen ) || !(gSaltLen >= chip::kPBKDFMinimumSaltLen && gSaltLen <= chip::kPBKDFMaximumSaltLen ))
180
+ if (!ParseInt (arg, gSaltLen ) ||
181
+ !(gSaltLen >= chip::Crypto::kSpake2pPBKDFMinimumSaltLen && gSaltLen <= chip::Crypto::kSpake2pPBKDFMaximumSaltLen ))
180
182
{
181
183
PrintArgError (" %s: Invalid value specified for salt length parameter: %s\n " , progName, arg);
182
184
return false ;
@@ -185,7 +187,8 @@ bool HandleOption(const char * progName, OptionSet * optSet, int id, const char
185
187
186
188
case ' s' :
187
189
gSalt = arg;
188
- if (!(strlen (gSalt ) >= chip::kPBKDFMinimumSaltLen && strlen (gSalt ) <= chip::kPBKDFMaximumSaltLen ))
190
+ if (!(strlen (gSalt ) >= chip::Crypto::kSpake2pPBKDFMinimumSaltLen &&
191
+ strlen (gSalt ) <= chip::Crypto::kSpake2pPBKDFMaximumSaltLen ))
189
192
{
190
193
fprintf (stderr, " %s: Invalid legth of the specified salt parameter: %s\n " , progName, arg);
191
194
return false ;
@@ -268,7 +271,7 @@ bool Cmd_GenVerifier(int argc, char * argv[])
268
271
269
272
for (uint32_t i = 0 ; i < gCount ; i++)
270
273
{
271
- uint8_t salt[chip::kPBKDFMaximumSaltLen ];
274
+ uint8_t salt[chip::Crypto:: kSpake2pPBKDFMaximumSaltLen ];
272
275
if (gSalt == nullptr )
273
276
{
274
277
CHIP_ERROR err = chip::Crypto::DRBG_get_bytes (salt, gSaltLen );
@@ -301,12 +304,13 @@ bool Cmd_GenVerifier(int argc, char * argv[])
301
304
return false ;
302
305
}
303
306
304
- char saltB64[BASE64_ENCODED_LEN (chip::kPBKDFMaximumSaltLen ) + 1 ];
307
+ char saltB64[BASE64_ENCODED_LEN (chip::Crypto:: kSpake2pPBKDFMaximumSaltLen ) + 1 ];
305
308
uint32_t saltB64Len = chip::Base64Encode32 (salt, gSaltLen , saltB64);
306
309
saltB64[saltB64Len] = ' \0 ' ;
307
310
308
- char verifierB64[BASE64_ENCODED_LEN (chip::kSpake2pSerializedVerifierSize ) + 1 ];
309
- uint32_t verifierB64Len = chip::Base64Encode32 (serializedVerifier, chip::kSpake2pSerializedVerifierSize , verifierB64);
311
+ char verifierB64[BASE64_ENCODED_LEN (chip::Crypto::kSpake2pSerializedVerifierSize ) + 1 ];
312
+ uint32_t verifierB64Len =
313
+ chip::Base64Encode32 (serializedVerifier, chip::Crypto::kSpake2pSerializedVerifierSize , verifierB64);
310
314
verifierB64[verifierB64Len] = ' \0 ' ;
311
315
312
316
if (fprintf (outFile, " %d,%08d,%d,%s,%s\n " , i, gPinCode , gIterationCount , saltB64, verifierB64) < 0 || ferror (outFile))
0 commit comments