skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Some warning cleanup.

Browse Source
This commit is contained in:
Maarten Billemont 2017-08-27 09:04:18 -04:00
parent 53eb5c8a73
commit 011416690a
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/c/mpw-algorithm_v0.c
View File

@ -19,7 +19,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "mpw-types.h"
#include "mpw-util.h" #include "mpw-util.h"
#include "base64.h" #include "base64.h"
@ -55,11 +54,11 @@ static MPMasterKey mpw_masterKey_v0(
// Calculate the master key salt. // Calculate the master key salt.
trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s\n", trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s\n",
keyScope, mpw_hex_l( mpw_utf8_strlen( fullName ) ), fullName ); keyScope, mpw_hex_l( (uint32_t)mpw_utf8_strlen( fullName ) ), fullName );
size_t masterKeySaltSize = 0; size_t masterKeySaltSize = 0;
uint8_t *masterKeySalt = NULL; uint8_t *masterKeySalt = NULL;
mpw_push_string( &masterKeySalt, &masterKeySaltSize, keyScope ); mpw_push_string( &masterKeySalt, &masterKeySaltSize, keyScope );
mpw_push_int( &masterKeySalt, &masterKeySaltSize, mpw_utf8_strlen( fullName ) ); mpw_push_int( &masterKeySalt, &masterKeySaltSize, (uint32_t)mpw_utf8_strlen( fullName ) );
mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName ); mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName );
if (!masterKeySalt) { if (!masterKeySalt) {
err( "Could not allocate master key salt: %s\n", strerror( errno ) ); err( "Could not allocate master key salt: %s\n", strerror( errno ) );
@ -91,16 +90,16 @@ static MPSiteKey mpw_siteKey_v0(
// Calculate the site seed. // Calculate the site seed.
trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s\n", trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s\n",
keyScope, mpw_hex_l( mpw_utf8_strlen( siteName ) ), siteName, mpw_hex_l( siteCounter ), keyScope, mpw_hex_l( (uint32_t)mpw_utf8_strlen( siteName ) ), siteName, mpw_hex_l( siteCounter ),
keyContext? mpw_hex_l( mpw_utf8_strlen( keyContext ) ): NULL, keyContext ); keyContext? mpw_hex_l( (uint32_t)mpw_utf8_strlen( keyContext ) ): NULL, keyContext );
size_t siteSaltSize = 0; size_t siteSaltSize = 0;
uint8_t *siteSalt = NULL; uint8_t *siteSalt = NULL;
mpw_push_string( &siteSalt, &siteSaltSize, keyScope ); mpw_push_string( &siteSalt, &siteSaltSize, keyScope );
mpw_push_int( &siteSalt, &siteSaltSize, mpw_utf8_strlen( siteName ) ); mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)mpw_utf8_strlen( siteName ) );
mpw_push_string( &siteSalt, &siteSaltSize, siteName ); mpw_push_string( &siteSalt, &siteSaltSize, siteName );
mpw_push_int( &siteSalt, &siteSaltSize, siteCounter ); mpw_push_int( &siteSalt, &siteSaltSize, siteCounter );
if (keyContext) { if (keyContext) {
mpw_push_int( &siteSalt, &siteSaltSize, mpw_utf8_strlen( keyContext ) ); mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)mpw_utf8_strlen( keyContext ) );
mpw_push_string( &siteSalt, &siteSaltSize, keyContext ); mpw_push_string( &siteSalt, &siteSaltSize, keyContext );
} }
if (!siteSalt) { if (!siteSalt) {

2
core/c/mpw-algorithm_v1.c
View File

@ -17,9 +17,7 @@
//============================================================================== //==============================================================================
#include <string.h> #include <string.h>
#include <errno.h>
#include "mpw-types.h"
#include "mpw-util.h" #include "mpw-util.h"
#define MP_N 32768LU #define MP_N 32768LU

9
core/c/mpw-algorithm_v2.c
View File

@ -19,7 +19,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "mpw-types.h"
#include "mpw-util.h" #include "mpw-util.h"
#define MP_N 32768LU #define MP_N 32768LU
@ -56,16 +55,16 @@ static MPSiteKey mpw_siteKey_v2(
// Calculate the site seed. // Calculate the site seed.
trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s\n", trc( "siteSalt: keyScope=%s | #siteName=%s | siteName=%s | siteCounter=%s | #keyContext=%s | keyContext=%s\n",
keyScope, mpw_hex_l( strlen( siteName ) ), siteName, mpw_hex_l( siteCounter ), keyScope, mpw_hex_l( (uint32_t)strlen( siteName ) ), siteName, mpw_hex_l( siteCounter ),
keyContext? mpw_hex_l( strlen( keyContext ) ): NULL, keyContext ); keyContext? mpw_hex_l( (uint32_t)strlen( keyContext ) ): NULL, keyContext );
size_t siteSaltSize = 0; size_t siteSaltSize = 0;
uint8_t *siteSalt = NULL; uint8_t *siteSalt = NULL;
mpw_push_string( &siteSalt, &siteSaltSize, keyScope ); mpw_push_string( &siteSalt, &siteSaltSize, keyScope );
mpw_push_int( &siteSalt, &siteSaltSize, strlen( siteName ) ); mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)strlen( siteName ) );
mpw_push_string( &siteSalt, &siteSaltSize, siteName ); mpw_push_string( &siteSalt, &siteSaltSize, siteName );
mpw_push_int( &siteSalt, &siteSaltSize, siteCounter ); mpw_push_int( &siteSalt, &siteSaltSize, siteCounter );
if (keyContext) { if (keyContext) {
mpw_push_int( &siteSalt, &siteSaltSize, strlen( keyContext ) ); mpw_push_int( &siteSalt, &siteSaltSize, (uint32_t)strlen( keyContext ) );
mpw_push_string( &siteSalt, &siteSaltSize, keyContext ); mpw_push_string( &siteSalt, &siteSaltSize, keyContext );
} }
if (!siteSalt) { if (!siteSalt) {

5
core/c/mpw-algorithm_v3.c
View File

@ -19,7 +19,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "mpw-types.h"
#include "mpw-util.h" #include "mpw-util.h"
#define MP_N 32768LU #define MP_N 32768LU
@ -48,11 +47,11 @@ static MPMasterKey mpw_masterKey_v3(
// Calculate the master key salt. // Calculate the master key salt.
trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s\n", trc( "masterKeySalt: keyScope=%s | #fullName=%s | fullName=%s\n",
keyScope, mpw_hex_l( strlen( fullName ) ), fullName ); keyScope, mpw_hex_l( (uint32_t)strlen( fullName ) ), fullName );
size_t masterKeySaltSize = 0; size_t masterKeySaltSize = 0;
uint8_t *masterKeySalt = NULL; uint8_t *masterKeySalt = NULL;
mpw_push_string( &masterKeySalt, &masterKeySaltSize, keyScope ); mpw_push_string( &masterKeySalt, &masterKeySaltSize, keyScope );
mpw_push_int( &masterKeySalt, &masterKeySaltSize, strlen( fullName ) ); mpw_push_int( &masterKeySalt, &masterKeySaltSize, (uint32_t)strlen( fullName ) );
mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName ); mpw_push_string( &masterKeySalt, &masterKeySaltSize, fullName );
if (!masterKeySalt) { if (!masterKeySalt) {
err( "Could not allocate master key salt: %s\n", strerror( errno ) ); err( "Could not allocate master key salt: %s\n", strerror( errno ) );