skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Format code.

Browse Source
This commit is contained in:
Maarten Billemont 2017-08-30 09:57:15 -04:00
parent 6f4f6b8d1e
commit d22f93e564
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/c/mpw-util.h
View File

@ -111,7 +111,7 @@ void mpw_uint64(const uint64_t number, uint8_t buf[8]);
/** Push a buffer onto a buffer. reallocs the given buffer and appends the given buffer. */ /** Push a buffer onto a buffer. reallocs the given buffer and appends the given buffer. */
bool mpw_push_buf( bool mpw_push_buf(
uint8_t ** buffer, size_t *bufferSize, const void *pushBuffer, const size_t pushSize); uint8_t **buffer, size_t *bufferSize, const void *pushBuffer, const size_t pushSize);
/** Push a string onto a buffer. reallocs the given buffer and appends the given string. */ /** Push a string onto a buffer. reallocs the given buffer and appends the given string. */
bool mpw_push_string( bool mpw_push_string(
uint8_t **buffer, size_t *bufferSize, const char *pushString); uint8_t **buffer, size_t *bufferSize, const char *pushString);

5
platform-independent/cli-c/cli/blf.h
View File

@ -61,8 +61,7 @@ void Blowfish_encipher(blf_ctx *, u_int32_t *, u_int32_t *);
void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *); void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *);
void Blowfish_initstate(blf_ctx *); void Blowfish_initstate(blf_ctx *);
void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t); void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t);
void Blowfish_expandstate void Blowfish_expandstate(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t);
(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t);
/* Standard Blowfish */ /* Standard Blowfish */
@ -77,6 +76,6 @@ void blf_cbc_encrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t);
void blf_cbc_decrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t); void blf_cbc_decrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t);
/* Converts u_int8_t to u_int32_t */ /* Converts u_int8_t to u_int32_t */
u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t , u_int16_t *); u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t, u_int16_t *);
#endif #endif

8
platform-independent/cli-c/cli/mpw-bench.c
View File

@ -71,7 +71,7 @@ int main(int argc, char *const argv[]) {
for (int i = 1; i <= iterations; ++i) { for (int i = 1; i <= iterations; ++i) {
free( (void *)mpw_hash_hmac_sha256( masterKey, MPMasterKeySize, sitePasswordInfo, 128 ) ); free( (void *)mpw_hash_hmac_sha256( masterKey, MPMasterKeySize, sitePasswordInfo, 128 ) );
if (modff(100.f * i / iterations, &percent) == 0) if (modff( 100.f * i / iterations, &percent ) == 0)
fprintf( stderr, "\rhmac-sha-256: iteration %d / %d (%.0f%%)..", i, iterations, percent ); fprintf( stderr, "\rhmac-sha-256: iteration %d / %d (%.0f%%)..", i, iterations, percent );
} }
const double hmacSha256Speed = mpw_showSpeed( startTime, iterations, "hmac-sha-256" ); const double hmacSha256Speed = mpw_showSpeed( startTime, iterations, "hmac-sha-256" );
@ -85,7 +85,7 @@ int main(int argc, char *const argv[]) {
for (int i = 1; i <= iterations; ++i) { for (int i = 1; i <= iterations; ++i) {
bcrypt( masterPassword, bcrypt_gensalt( bcrypt_rounds ) ); bcrypt( masterPassword, bcrypt_gensalt( bcrypt_rounds ) );
if (modff(100.f * i / iterations, &percent) == 0) if (modff( 100.f * i / iterations, &percent ) == 0)
fprintf( stderr, "\rbcrypt (rounds 10^%d): iteration %d / %d (%.0f%%)..", bcrypt_rounds, i, iterations, percent ); fprintf( stderr, "\rbcrypt (rounds 10^%d): iteration %d / %d (%.0f%%)..", bcrypt_rounds, i, iterations, percent );
} }
const double bcrypt9Speed = mpw_showSpeed( startTime, iterations, "bcrypt" ); const double bcrypt9Speed = mpw_showSpeed( startTime, iterations, "bcrypt" );
@ -97,7 +97,7 @@ int main(int argc, char *const argv[]) {
for (int i = 1; i <= iterations; ++i) { for (int i = 1; i <= iterations; ++i) {
free( (void *)mpw_masterKey( fullName, masterPassword, MPAlgorithmVersionCurrent ) ); free( (void *)mpw_masterKey( fullName, masterPassword, MPAlgorithmVersionCurrent ) );
if (modff(100.f * i / iterations, &percent) == 0) if (modff( 100.f * i / iterations, &percent ) == 0)
fprintf( stderr, "\rscrypt_mpw: iteration %d / %d (%.0f%%)..", i, iterations, percent ); fprintf( stderr, "\rscrypt_mpw: iteration %d / %d (%.0f%%)..", i, iterations, percent );
} }
const double scryptSpeed = mpw_showSpeed( startTime, iterations, "scrypt_mpw" ); const double scryptSpeed = mpw_showSpeed( startTime, iterations, "scrypt_mpw" );
@ -117,7 +117,7 @@ int main(int argc, char *const argv[]) {
masterKey, siteName, siteCounter, keyPurpose, keyContext, resultType, NULL, MPAlgorithmVersionCurrent ) ); masterKey, siteName, siteCounter, keyPurpose, keyContext, resultType, NULL, MPAlgorithmVersionCurrent ) );
free( (void *)masterKey ); free( (void *)masterKey );
if (modff(100.f * i / iterations, &percent) == 0) if (modff( 100.f * i / iterations, &percent ) == 0)
fprintf( stderr, "\rmpw: iteration %d / %d (%.0f%%)..", i, iterations, percent ); fprintf( stderr, "\rmpw: iteration %d / %d (%.0f%%)..", i, iterations, percent );
} }
const double mpwSpeed = mpw_showSpeed( startTime, iterations, "mpw" ); const double mpwSpeed = mpw_showSpeed( startTime, iterations, "mpw" );

2
platform-independent/cli-c/cli/mpw-tests-util.c
View File

@ -38,7 +38,7 @@ xmlNodePtr mpw_xmlTestCaseNode(xmlNodePtr testCaseNode, const char *nodeName) {
return child; return child;
// Missing content, try to find parent case. // Missing content, try to find parent case.
if (strcmp(nodeName, "parent") == 0) if (strcmp( nodeName, "parent" ) == 0)
// Was just searching for testCaseNode's parent, none found. // Was just searching for testCaseNode's parent, none found.
return NULL; return NULL;
xmlChar *parentId = mpw_xmlTestCaseString( testCaseNode, "parent" ); xmlChar *parentId = mpw_xmlTestCaseString( testCaseNode, "parent" );