From 491d6fdabb3d95905cd96d905e1f965ce8ff07e1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 8 Aug 2016 18:45:29 +0200 Subject: 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 --- g10/gpgv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'g10/gpgv.c') diff --git a/g10/gpgv.c b/g10/gpgv.c index d08dc5a7a..59edbb978 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -486,15 +486,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) @@ -503,11 +501,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 * -- cgit v1.2.3