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/encrypt.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/encrypt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 54a17c31e..2985408a4 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -221,8 +221,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey) s2k = xmalloc_clear( sizeof *s2k ); s2k->mode = opt.s2k_mode; s2k->hash_algo = S2K_DIGEST_ALGO; - cfx.dek = passphrase_to_dek (NULL, 0, - default_cipher_algo(), s2k, 4, + cfx.dek = passphrase_to_dek (default_cipher_algo (), s2k, 1, 0, NULL, &canceled); if ( !cfx.dek || !cfx.dek->keylen ) { @@ -413,8 +412,8 @@ setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek) (*symkey_s2k)->mode = opt.s2k_mode; (*symkey_s2k)->hash_algo = S2K_DIGEST_ALGO; - *symkey_dek=passphrase_to_dek(NULL,0,opt.s2k_cipher_algo, - *symkey_s2k, 4, NULL, &canceled); + *symkey_dek = passphrase_to_dek (opt.s2k_cipher_algo, + *symkey_s2k, 1, 0, NULL, &canceled); if(!*symkey_dek || !(*symkey_dek)->keylen) { xfree(*symkey_dek); |