diff options
| author | Werner Koch <[email protected]> | 2016-08-08 16:45:29 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-08-08 18:32:08 +0000 |
| commit | 491d6fdabb3d95905cd96d905e1f965ce8ff07e1 (patch) | |
| tree | 7c6fec812be5d54234c41106c4d4cc6a2a15d83a /g10/sign.c | |
| parent | gpg: Cleanup of dek_to_passphrase function (part 1). (diff) | |
| download | gnupg-491d6fdabb3d95905cd96d905e1f965ce8ff07e1.tar.gz gnupg-491d6fdabb3d95905cd96d905e1f965ce8ff07e1.zip | |
gpg: Cleanup of dek_to_passphrase function (part 2).
* g10/passphrase.c (passphrase_get): Remove arg KEYID. Change arg
MODE to NOCACHE.
(passphrase_to_dek): Remove args KEYID and PUBKEY_ALGO. Split arg
MODE into CREATE and NOCACHE. Change all callers and adjust stubs.
(passphrase_clear_cache): Remove args KEYID and ALGO. They are not
used. Change caller.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/sign.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/sign.c b/g10/sign.c index 6a7a87e03..217196db9 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -1270,7 +1270,7 @@ sign_symencrypt_file (ctrl_t ctrl, const char *fname, strlist_t locusr) if (!opt.quiet || !opt.batch) log_info (_("%s encryption will be used\n"), openpgp_cipher_algo_name (algo) ); - cfx.dek = passphrase_to_dek( NULL, 0, algo, s2k, 2, NULL, &canceled); + cfx.dek = passphrase_to_dek (algo, s2k, 1, 1, NULL, &canceled); if (!cfx.dek || !cfx.dek->keylen) { rc = gpg_error (canceled?GPG_ERR_CANCELED:GPG_ERR_BAD_PASSPHRASE); |