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/mainproc.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 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 4217ccdb4..e50e212ee 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -329,7 +329,7 @@ proc_symkey_enc (CTX c, PACKET *pkt) } else { - c->dek = passphrase_to_dek (NULL, 0, algo, &enc->s2k, 3, NULL, NULL); + c->dek = passphrase_to_dek (algo, &enc->s2k, 0, 0, NULL, NULL); if (c->dek) { c->dek->symmetric = 1; @@ -587,7 +587,7 @@ proc_encrypted (CTX c, PACKET *pkt) log_info (_("assuming %s encrypted data\n"), "IDEA"); } - c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 3, NULL, &canceled); + c->dek = passphrase_to_dek (algo, s2k, 0, 0, NULL, &canceled); if (c->dek) c->dek->algo_info_printed = 1; else if (canceled) @@ -646,7 +646,7 @@ proc_encrypted (CTX c, PACKET *pkt) if (opt.debug) log_debug ("cleared passphrase cached with ID: %s\n", c->dek->s2k_cacheid); - passphrase_clear_cache (NULL, c->dek->s2k_cacheid, 0); + passphrase_clear_cache (c->dek->s2k_cacheid); } glo_ctrl.lasterr = result; write_status (STATUS_DECRYPTION_FAILED); |