Some better memory maintenance.
This commit is contained in:
parent
0ccd545dd4
commit
73c10906e3
@ -13,11 +13,11 @@
|
|||||||
|
|
||||||
#include "mpw-types.h"
|
#include "mpw-types.h"
|
||||||
#include "mpw-util.h"
|
#include "mpw-util.h"
|
||||||
|
#include "mpw-algorithm.h"
|
||||||
|
|
||||||
#define MP_N 32768
|
#define MP_N 32768
|
||||||
#define MP_r 8
|
#define MP_r 8
|
||||||
#define MP_p 2
|
#define MP_p 2
|
||||||
#define MP_dkLen 64
|
|
||||||
#define MP_hash PearlHashSHA256
|
#define MP_hash PearlHashSHA256
|
||||||
|
|
||||||
const uint8_t *mpw_masterKeyForUser(const char *fullName, const char *masterPassword) {
|
const uint8_t *mpw_masterKeyForUser(const char *fullName, const char *masterPassword) {
|
||||||
@ -34,16 +34,20 @@ const uint8_t *mpw_masterKeyForUser(const char *fullName, const char *masterPass
|
|||||||
mpw_pushString( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
|
mpw_pushString( &masterKeySalt, &masterKeySaltSize, mpKeyScope );
|
||||||
mpw_pushInt( &masterKeySalt, &masterKeySaltSize, htonl( strlen( fullName ) ) );
|
mpw_pushInt( &masterKeySalt, &masterKeySaltSize, htonl( strlen( fullName ) ) );
|
||||||
mpw_pushString( &masterKeySalt, &masterKeySaltSize, fullName );
|
mpw_pushString( &masterKeySalt, &masterKeySaltSize, fullName );
|
||||||
if (!masterKeySalt)
|
if (!masterKeySalt) {
|
||||||
ftl( "Could not allocate master key salt: %d\n", errno );
|
ftl( "Could not allocate master key salt: %d\n", errno );
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
trc( "masterKeySalt ID: %s\n", mpw_idForBuf( masterKeySalt, masterKeySaltSize ) );
|
trc( "masterKeySalt ID: %s\n", mpw_idForBuf( masterKeySalt, masterKeySaltSize ) );
|
||||||
|
|
||||||
// Calculate the master key.
|
// Calculate the master key.
|
||||||
// masterKey = scrypt( masterPassword, masterKeySalt )
|
// masterKey = scrypt( masterPassword, masterKeySalt )
|
||||||
const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
|
const uint8_t *masterKey = mpw_scrypt( MP_dkLen, masterPassword, masterKeySalt, masterKeySaltSize, MP_N, MP_r, MP_p );
|
||||||
mpw_free( masterKeySalt, masterKeySaltSize );
|
mpw_free( masterKeySalt, masterKeySaltSize );
|
||||||
if (!masterKey)
|
if (!masterKey) {
|
||||||
ftl( "Could not allocate master key: %d\n", errno );
|
ftl( "Could not allocate master key: %d\n", errno );
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
trc( "masterKey ID: %s\n", mpw_idForBuf( masterKey, MP_dkLen ) );
|
trc( "masterKey ID: %s\n", mpw_idForBuf( masterKey, MP_dkLen ) );
|
||||||
|
|
||||||
return masterKey;
|
return masterKey;
|
||||||
@ -71,20 +75,28 @@ const char *mpw_passwordForSite(const uint8_t *masterKey, const char *siteName,
|
|||||||
mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteContext ) ) );
|
mpw_pushInt( &sitePasswordInfo, &sitePasswordInfoSize, htonl( strlen( siteContext ) ) );
|
||||||
mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
|
mpw_pushString( &sitePasswordInfo, &sitePasswordInfoSize, siteContext );
|
||||||
}
|
}
|
||||||
if (!sitePasswordInfo)
|
if (!sitePasswordInfo) {
|
||||||
ftl( "Could not allocate site seed info: %d\n", errno );
|
ftl( "Could not allocate site seed info: %d\n", errno );
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
trc( "sitePasswordInfo ID: %s\n", mpw_idForBuf( sitePasswordInfo, sitePasswordInfoSize ) );
|
trc( "sitePasswordInfo ID: %s\n", mpw_idForBuf( sitePasswordInfo, sitePasswordInfoSize ) );
|
||||||
|
|
||||||
const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
|
const uint8_t *sitePasswordSeed = mpw_hmac_sha256( masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoSize );
|
||||||
if (!sitePasswordSeed)
|
mpw_free( sitePasswordInfo, sitePasswordInfoSize );
|
||||||
|
if (!sitePasswordSeed) {
|
||||||
ftl( "Could not allocate site seed: %d\n", errno );
|
ftl( "Could not allocate site seed: %d\n", errno );
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
trc( "sitePasswordSeed ID: %s\n", mpw_idForBuf( sitePasswordSeed, 32 ) );
|
trc( "sitePasswordSeed ID: %s\n", mpw_idForBuf( sitePasswordSeed, 32 ) );
|
||||||
|
|
||||||
// Determine the template.
|
// Determine the template.
|
||||||
const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
|
const char *template = mpw_templateForType( siteType, sitePasswordSeed[0] );
|
||||||
trc( "type %d, template: %s\n", siteType, template );
|
trc( "type %d, template: %s\n", siteType, template );
|
||||||
if (strlen( template ) > 32)
|
if (strlen( template ) > 32) {
|
||||||
ftl( "Template too long for password seed: %lu", strlen( template ) );
|
ftl( "Template too long for password seed: %lu", strlen( template ) );
|
||||||
|
mpw_free( sitePasswordSeed, sizeof( sitePasswordSeed ) );
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
// Encode the password from the seed using the template.
|
// Encode the password from the seed using the template.
|
||||||
char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
|
char *const sitePassword = calloc( strlen( template ) + 1, sizeof( char ) );
|
||||||
|
@ -6,13 +6,15 @@
|
|||||||
// Copyright (c) 2014 Lyndir. All rights reserved.
|
// Copyright (c) 2014 Lyndir. All rights reserved.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#define MP_dkLen 64
|
||||||
|
|
||||||
/** Derive the master key for a user based on their name and master password.
|
/** Derive the master key for a user based on their name and master password.
|
||||||
* @return A new 64-byte allocated buffer. */
|
* @return A new MP_dkLen-byte allocated buffer or NULL if an allocation error occurred. */
|
||||||
const uint8_t *mpw_masterKeyForUser(
|
const uint8_t *mpw_masterKeyForUser(
|
||||||
const char *fullName, const char *masterPassword);
|
const char *fullName, const char *masterPassword);
|
||||||
|
|
||||||
/** Encode a password for the site from the given master key and site parameters.
|
/** Encode a password for the site from the given master key and site parameters.
|
||||||
* @return A newly allocated string. */
|
* @return A newly allocated string or NULL if an allocation error occurred. */
|
||||||
const char *mpw_passwordForSite(
|
const char *mpw_passwordForSite(
|
||||||
const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
|
const uint8_t *masterKey, const char *siteName, const MPSiteType siteType, const uint32_t siteCounter,
|
||||||
const MPSiteVariant siteVariant, const char *siteContext);
|
const MPSiteVariant siteVariant, const char *siteContext);
|
||||||
|
@ -190,9 +190,14 @@ int main(int argc, char *const argv[]) {
|
|||||||
// Output the password.
|
// Output the password.
|
||||||
const uint8_t *masterKey = mpw_masterKeyForUser( fullName, masterPassword );
|
const uint8_t *masterKey = mpw_masterKeyForUser( fullName, masterPassword );
|
||||||
mpw_free( masterPassword, strlen( masterPassword ) );
|
mpw_free( masterPassword, strlen( masterPassword ) );
|
||||||
|
if (!masterKey)
|
||||||
|
ftl( "Couldn't derive master key." );
|
||||||
|
|
||||||
const char *sitePassword = mpw_passwordForSite( masterKey, siteName, siteType, siteCounter, siteVariant, siteContextString );
|
const char *sitePassword = mpw_passwordForSite( masterKey, siteName, siteType, siteCounter, siteVariant, siteContextString );
|
||||||
fprintf( stdout, "%s\n", sitePassword );
|
mpw_free( masterKey, MP_dkLen );
|
||||||
|
if (!sitePassword)
|
||||||
|
ftl( "Couldn't derive site password." );
|
||||||
|
|
||||||
|
fprintf( stdout, "%s\n", sitePassword );
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -18,12 +18,16 @@
|
|||||||
void mpw_pushBuf(uint8_t **const buffer, size_t *const bufferSize, const void *pushBuffer, const size_t pushSize) {
|
void mpw_pushBuf(uint8_t **const buffer, size_t *const bufferSize, const void *pushBuffer, const size_t pushSize) {
|
||||||
|
|
||||||
if (*bufferSize == (size_t)-1)
|
if (*bufferSize == (size_t)-1)
|
||||||
|
// The buffer was marked as broken, it is missing a previous push. Abort to avoid corrupt content.
|
||||||
return;
|
return;
|
||||||
|
|
||||||
*bufferSize += pushSize;
|
*bufferSize += pushSize;
|
||||||
*buffer = realloc( *buffer, *bufferSize );
|
uint8_t **const resizedBuffer = realloc( *buffer, *bufferSize );
|
||||||
if (!*buffer) {
|
if (!resizedBuffer) {
|
||||||
|
// realloc failed, we can't push. Mark the buffer as broken.
|
||||||
|
mpw_free( *buffer, *bufferSize - pushSize );
|
||||||
*bufferSize = -1;
|
*bufferSize = -1;
|
||||||
|
*buffer = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user