diff options
| author | Werner Koch <wk@gnupg.org> | 2006-05-23 18:19:43 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2006-05-23 18:19:43 +0200 |
| commit | fbe4ac37f6d3e7870e26caffb0d21c3c77198297 (patch) | |
| tree | f21028be87bda6df4f2f1e3ae105feeb5a2eb158 /g10/passphrase.c | |
| parent | 2006-05-19 Marcus Brinkmann <marcus@g10code.de> (diff) | |
| download | gnupg2-fbe4ac37f6d3e7870e26caffb0d21c3c77198297.tar.xz gnupg2-fbe4ac37f6d3e7870e26caffb0d21c3c77198297.zip | |
g10/ does build again.
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index c1cdf12ae..1c5cf3b27 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1017,7 +1017,7 @@ hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create ) int pwlen = strlen(pw); assert( s2k->hash_algo ); - dek->keylen = gcry_cipher_algo_get_keylen (dek->algo ); + dek->keylen = gcry_cipher_get_algo_keylen (dek->algo); if( !(dek->keylen > 0 && dek->keylen <= DIM(dek->key)) ) BUG(); @@ -1065,7 +1065,7 @@ hash_passphrase( DEK *dek, char *pw, STRING2KEY *s2k, int create ) i = gcry_md_get_algo_dlen ( s2k->hash_algo ); if( i > dek->keylen - used ) i = dek->keylen - used; - memcpy( dek->key+used, md_read(md, s2k->hash_algo), i ); + memcpy (dek->key+used, gcry_md_read (md, s2k->hash_algo), i); used += i; } gcry_md_close(md); |