pinkfluid/Passgeny
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c,python: Change the algorithm for hashing the master password to Argon2

Browse Source
This commit is contained in:
Mitja HORVAT
2021-11-14 09:59:51 +01:00
parent c869c79619
commit cc473f4c24
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c/passgeny/inc/passgeny.h
View File

@ -8,7 +8,7 @@ typedef struct passgeny passgeny_t;
struct passgeny struct passgeny
{ {
uint8_t pg_master_hash[32]; /* SHA256 of the master password */ uint8_t pg_master_hash[128]; /* Hash of the master password */
char *pg_pattern; /* Password pattern */ char *pg_pattern; /* Password pattern */
double pg_last_bits_total; /* Total bits that were available for generating the last password */ double pg_last_bits_total; /* Total bits that were available for generating the last password */
double pg_last_bits_used; /* Bits consumed when calculating the last password */ double pg_last_bits_used; /* Bits consumed when calculating the last password */

2
c/passgeny/meson.build
View File

@ -5,6 +5,6 @@ passgeny_lib = static_library(
'passgeny', 'passgeny',
['src/passgeny.c'], ['src/passgeny.c'],
include_directories : passgeny_inc, include_directories : passgeny_inc,
dependencies: [ dependency('libcrypto'), dependency('libargon2'), phogen_dep, bhash_dep]) dependencies: [ dependency('libargon2'), phogen_dep, bhash_dep])
passgeny_dep = declare_dependency(link_with : passgeny_lib, include_directories : passgeny_inc) passgeny_dep = declare_dependency(link_with : passgeny_lib, include_directories : passgeny_inc)

24
c/passgeny/src/passgeny.c
View File

@ -39,8 +39,8 @@
/* Ensure that pg_master_hash is big enough to hold a SHA256 hash */ /* Ensure that pg_master_hash is big enough to hold a SHA256 hash */
_Static_assert( _Static_assert(
sizeof(((passgeny_t *)NULL)->pg_master_hash) == SHA256_DIGEST_LENGTH, sizeof(((passgeny_t *)NULL)->pg_master_hash) == PASSGENY_ARGON2_HASH_LEN,
"pg_master_hash doesn't match SHA256_DIGEST_LENGTH"); "pg_master_hash doesn't match PASSGENY_ARGON2_HASH_LEN");
static bool passgeny_patmatch( static bool passgeny_patmatch(
const char **pstr, const char **pstr,
@ -57,13 +57,25 @@ static void passgeny_gen_str(char *out, size_t out_sz, const char *pool, bhash_t
*/ */
bool passgeny_init(passgeny_t *passgeny, const char *master_password) bool passgeny_init(passgeny_t *passgeny, const char *master_password)
{ {
SHA256_CTX sha256; bool rc;
memset(passgeny, 0, sizeof(*passgeny)); memset(passgeny, 0, sizeof(*passgeny));
SHA256_Init(&sha256); rc = argon2id_hash_raw(
SHA256_Update(&sha256, master_password, strlen(master_password)); PASSGENY_ARGON2_TIME_COST,
SHA256_Final(passgeny->pg_master_hash, &sha256); PASSGENY_ARGON2_MEMORY_COST,
PASSGENY_ARGON2_PARALLEL,
master_password,
strlen(master_password),
PASSGENY_ARGON2_SALT,
strlen(PASSGENY_ARGON2_SALT),
passgeny->pg_master_hash,
sizeof(passgeny->pg_master_hash));
if (rc != 0)
{
fprintf(stderr, "Error generating master hash.");
return false;
}
passgeny->pg_pattern = strdup(PASSGENY_DEFAULT_PATTERN); passgeny->pg_pattern = strdup(PASSGENY_DEFAULT_PATTERN);

3
python/passgeny/passgeny.py
View File

@ -3,7 +3,6 @@
# #
import argon2 import argon2
import argparse import argparse
import hashlib
import re import re
from . import bhash, phogen from . import bhash, phogen
@ -33,7 +32,7 @@ class PassgenyInvalidPattern(Exception):
class Passgeny: class Passgeny:
def __init__(self, master_password): def __init__(self, master_password):
self.master_password = hashlib.sha256(master_password.encode()).digest() self.master_password = self.__argon2_hash(master_password.encode())
self.pattern = PASSGENY_DEFAULT_PATTERN self.pattern = PASSGENY_DEFAULT_PATTERN
def generate(self, domain, user, *tokens): def generate(self, domain, user, *tokens):