skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Ability to pass the algorithm version on the CLI.

Browse Source
This commit is contained in:
Maarten Billemont 2015-01-16 00:25:18 -05:00
parent 57769ba199
commit a03dcf6859
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MasterPassword/C/mpw-cli.c
View File

@ -40,6 +40,8 @@ static void usage() {
" p, phrase | 20 character sentence.\n\n", MP_env_sitetype ); " p, phrase | 20 character sentence.\n\n", MP_env_sitetype );
fprintf( stderr, " -c counter The value of the counter.\n" fprintf( stderr, " -c counter The value of the counter.\n"
" Defaults to %s in env or '1'.\n\n", MP_env_sitecounter ); " Defaults to %s in env or '1'.\n\n", MP_env_sitecounter );
fprintf( stderr, " -V version The algorithm version to use.\n"
" Defaults to %d.\n\n", MPAlgorithmVersionCurrent );
fprintf( stderr, " -v variant The kind of content to generate.\n" fprintf( stderr, " -v variant The kind of content to generate.\n"
" Defaults to 'password'.\n" " Defaults to 'password'.\n"
" p, password | The password to log in with.\n" " p, password | The password to log in with.\n"
@ -102,9 +104,10 @@ int main(int argc, char *const argv[]) {
const char *siteContextString = NULL; const char *siteContextString = NULL;
uint32_t siteCounter = 1; uint32_t siteCounter = 1;
const char *siteCounterString = getenv( MP_env_sitecounter ); const char *siteCounterString = getenv( MP_env_sitecounter );
MPAlgorithmVersion algorithmVersion = MPAlgorithmVersionCurrent;
// Read the options. // Read the options.
for (int opt; (opt = getopt( argc, argv, "u:t:c:v:C:h" )) != -1;) for (int opt; (opt = getopt( argc, argv, "u:t:c:v:V:C:h" )) != -1;)
switch (opt) { switch (opt) {
case 'u': case 'u':
fullName = optarg; fullName = optarg;
@ -118,6 +121,10 @@ int main(int argc, char *const argv[]) {
case 'v': case 'v':
siteVariantString = optarg; siteVariantString = optarg;
break; break;
case 'V':
if (sscanf( optarg, "%u", &algorithmVersion ) != 1)
ftl( "Not a version: %s\n", optarg );
break;
case 'C': case 'C':
siteContextString = optarg; siteContextString = optarg;
break; break;
@ -189,13 +196,13 @@ int main(int argc, char *const argv[]) {
// Output the password. // Output the password.
const uint8_t *masterKey = mpw_masterKeyForUser( const uint8_t *masterKey = mpw_masterKeyForUser(
fullName, masterPassword, MPAlgorithmVersionCurrent ); fullName, masterPassword, algorithmVersion );
mpw_freeString( masterPassword ); mpw_freeString( masterPassword );
if (!masterKey) if (!masterKey)
ftl( "Couldn't derive master key." ); ftl( "Couldn't derive master key." );
const char *sitePassword = mpw_passwordForSite( const char *sitePassword = mpw_passwordForSite(
masterKey, siteName, siteType, siteCounter, siteVariant, siteContextString, MPAlgorithmVersionCurrent ); masterKey, siteName, siteType, siteCounter, siteVariant, siteContextString, algorithmVersion );
mpw_free( masterKey, MP_dkLen ); mpw_free( masterKey, MP_dkLen );
if (!sitePassword) if (!sitePassword)
ftl( "Couldn't derive site password." ); ftl( "Couldn't derive site password." );