diff options
| author | Werner Koch <wk@gnupg.org> | 2016-08-08 18:45:29 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-08-08 20:32:08 +0200 |
| commit | 491d6fdabb3d95905cd96d905e1f965ce8ff07e1 (patch) | |
| tree | 7c6fec812be5d54234c41106c4d4cc6a2a15d83a /g10/test-stubs.c | |
| parent | gpg: Cleanup of dek_to_passphrase function (part 1). (diff) | |
| download | gnupg2-491d6fdabb3d95905cd96d905e1f965ce8ff07e1.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'g10/test-stubs.c')
| -rw-r--r-- | g10/test-stubs.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/g10/test-stubs.c b/g10/test-stubs.c index 6f50759d5..6cf43a359 100644 --- a/g10/test-stubs.c +++ b/g10/test-stubs.c @@ -294,15 +294,13 @@ check_secret_key (PKT_public_key *pk, int n) * No secret key, so no passphrase needed */ DEK * -passphrase_to_dek (u32 *keyid, int pubkey_algo, - int cipher_algo, STRING2KEY *s2k, int mode, +passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, int create, int nocache, const char *tmp, int *canceled) { - (void)keyid; - (void)pubkey_algo; (void)cipher_algo; (void)s2k; - (void)mode; + (void)create; + (void)nocache; (void)tmp; if (canceled) @@ -311,11 +309,9 @@ passphrase_to_dek (u32 *keyid, int pubkey_algo, } void -passphrase_clear_cache (u32 *keyid, const char *cacheid, int algo) +passphrase_clear_cache (const char *cacheid) { - (void)keyid; (void)cacheid; - (void)algo; } struct keyserver_spec * |