diff options
| author | Werner Koch <[email protected]> | 2021-05-17 17:27:54 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-05-17 17:48:15 +0000 |
| commit | 6dfae2f402a702ccd7f2c585b28cb356e9f26a26 (patch) | |
| tree | 199d5a9ebc0f1afdeb94a8e8e0096985b41d9770 /g10/encrypt.c | |
| parent | dirmngr: LDAP search by a mailbox now ignores revoked keys. (diff) | |
| download | gnupg-6dfae2f402a702ccd7f2c585b28cb356e9f26a26.tar.gz gnupg-6dfae2f402a702ccd7f2c585b28cb356e9f26a26.zip | |
gpg: Use a more descriptive prompt for symmetric decryption.
* g10/keydb.h (GETPASSWORD_FLAG_SYMDECRYPT): New.
(passphrase_to_dek_ext): Remove this obsolete prototype.
* g10/passphrase.c (passphrase_get): Add arg flags. Use new flag
value.
(passphrase_to_dek): Add arg flags and pass it on.
* g10/mainproc.c (proc_symkey_enc): Use new flag.
* sm/decrypt.c (pwri_decrypt): Use "passphrase".
--
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit 03f83bcda5d1f8d8246bcc1afc603b7f74d0626b)
Note that we keep on using the term "passphrase" although "password"
would be better. There are however so many occurance of this and
given it is a bike shedding topic we fix that in the PO files.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/encrypt.c')
| -rw-r--r-- | g10/encrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 388c3db74..d9af54ae6 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -572,7 +572,7 @@ setup_symkey (STRING2KEY **symkey_s2k, DEK **symkey_dek) (*symkey_s2k)->hash_algo = s2kdigest; *symkey_dek = passphrase_to_dek (defcipher, - *symkey_s2k, 1, 0, NULL, &canceled); + *symkey_s2k, 1, 0, NULL, 0, &canceled); if (!*symkey_dek || !(*symkey_dek)->keylen) { xfree(*symkey_dek); |