diff options
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 5ae3966ac..9711f5aff 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -33,7 +33,7 @@ static int pwfd = -1; -static void hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k ); +static void hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create ); void set_passphrase_fd( int fd ) @@ -54,7 +54,7 @@ get_passphrase_fd() * Returns: m_alloced md5 passphrase hash; caller must free */ DEK * -get_passphrase_hash( u32 *keyid, char *text, byte *salt ) +get_passphrase_hash( u32 *keyid, int cipher_algo, STRING2KEY *s2k ) { char *pw; DEK *dek; @@ -97,9 +97,8 @@ get_passphrase_hash( u32 *keyid, char *text, byte *salt ) tty_kill_prompt(); } dek = m_alloc_secure( sizeof *dek ); - dek->algo = CIPHER_ALGO_BLOWFISH; /* fixme: allow others ciphers */ - if( hash_passphrase( dek, pw, salt ) ) - log_bug("get_passphrase_hash\n"); + dek->algo = cipher_algo; + hash_passphrase( dek, pw, s2k, 0 ); m_free(pw); /* is allocated in secure memory, so it will be burned */ return dek; } @@ -146,20 +145,19 @@ static void hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create ) { MD_HANDLE md; - int rc = 0; assert( s2k->hash_algo ); dek->keylen = 0; md = md_open( s2k->hash_algo, 1); if( s2k->mode == 1 || s2k->mode == 4 ) { if( create ) - randomize_buffer(&s2k->salt, 8, 1); + randomize_buffer(s2k->salt, 8, 1); md_write( md, s2k->salt, 8 ); } md_write( md, pw, strlen(pw) ); md_final( md ); - dek->keylen = cipher_get_keylen( dek->algo ); - assert(dek->keylen > 0 && dek->keylen < DIM(dek->key) ); + dek->keylen = cipher_get_keylen( dek->algo ) / 8; + assert(dek->keylen > 0 && dek->keylen <= DIM(dek->key) ); memcpy( dek->key, md_read(md,0), dek->keylen ); md_close(md); } |