diff options
| author | Werner Koch <[email protected]> | 1999-07-01 10:53:35 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1999-07-01 10:53:35 +0000 |
| commit | 28eb86c0063dabf55763e00c4f9abcae8117c493 (patch) | |
| tree | dd18314317ef387a4d65464277a44355a00773d6 /g10/passphrase.c | |
| parent | See ChangeLog: Tue Jun 29 21:44:25 CEST 1999 Werner Koch (diff) | |
| download | gnupg-28eb86c0063dabf55763e00c4f9abcae8117c493.tar.gz gnupg-28eb86c0063dabf55763e00c4f9abcae8117c493.zip | |
See ChangeLog: Thu Jul 1 12:47:31 CEST 1999 Werner Koch
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 9581246f2..80c6fa33f 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -114,9 +114,11 @@ read_passphrase_from_fd( int fd ) * (only for mode 2) * a dek->keylen of 0 means: no passphrase entered. * (only for mode 2) + * pubkey_algo is only informational. */ DEK * -passphrase_to_dek( u32 *keyid, int cipher_algo, STRING2KEY *s2k, int mode ) +passphrase_to_dek( u32 *keyid, int pubkey_algo, + int cipher_algo, STRING2KEY *s2k, int mode ) { char *pw = NULL; DEK *dek; @@ -139,8 +141,8 @@ passphrase_to_dek( u32 *keyid, int cipher_algo, STRING2KEY *s2k, int mode ) sprintf( buf, "%08lX%08lX", (ulong)keyid[0], (ulong)keyid[1] ); if( keyid[2] && keyid[3] && keyid[0] != keyid[2] && keyid[1] != keyid[3] ) - sprintf( buf+strlen(buf), " %08lX%08lX", - (ulong)keyid[2], (ulong)keyid[3] ); + sprintf( buf+strlen(buf), " %08lX%08lX %d 0", + (ulong)keyid[2], (ulong)keyid[3], pubkey_algo ); write_status_text( STATUS_NEED_PASSPHRASE, buf ); } else { |