security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg: Cleanup of dek_to_passphrase function (part 2).

Browse source 
* 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>
This commit is contained in:
Werner Koch 2016-08-08 18:45:29 +02:00
parent 5b614973fe
commit 491d6fdabb
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
7 changed files with 46 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

12
g10/test-stubs.c
View file

@ -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 *