extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-12-26 00:28:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

reset salt and iteration count when changing password

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/trunk@36 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough 2008-08-16 18:06:24 +00:00
parent 921a361e1b
commit bcfe2aff09
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
encfs/encfsctl.cpp
View File

@ -692,6 +692,21 @@ static int do_chpasswd( bool useStdin, int argc, char **argv )
// Now, get New user key..
userKey.reset();
cout << _("Enter new Encfs password\n");
// reinitialize salt and iteration count
config.kdfIterations = 0; // generate new
if(config.saltSize != 20)
{
if(config.saltData != NULL)
delete[] config.saltData;
config.saltSize = 20;
config.saltData = new unsigned char[config.saltSize];
}
if(!cipher->randomize(config.saltData, config.saltSize, 20))
{
cout << _("Error creating salt\n");
return EXIT_FAILURE;
}
if( useStdin )
userKey = getUserKey( cipher, true,
config.saltData, config.saltSize,
@ -724,6 +739,9 @@ static int do_chpasswd( bool useStdin, int argc, char **argv )
{
cout << _("Error saving modified config file.\n");
}
} else
{
cout << _("Error creating key\n");
}
volumeKey.reset();