security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-10 17:51:04 +02:00
Code Activity

Rename Ben's new option.

Browse Source
This commit is contained in:
Werner Koch 2011-03-02 09:11:40 +01:00
parent 0706511b6d
commit 528d77a0cc
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/ChangeLog
View File

@ -1,3 +1,7 @@
2011-03-02 Ben Kibbey <bjk@luxsci.net> (wk)
* command.c (cmd_clear_passphrase): Add option --mode=normal.
2011-02-07 Werner Koch <wk@g10code.com> 2011-02-07 Werner Koch <wk@g10code.com>
* pksign.c (do_encode_dsa): Enforce multipe of 8 bits only for DSA. * pksign.c (do_encode_dsa): Enforce multipe of 8 bits only for DSA.

14
agent/command.c
View File

@ -1267,20 +1267,20 @@ cmd_get_passphrase (assuan_context_t ctx, char *line)
static const char hlp_clear_passphrase[] = static const char hlp_clear_passphrase[] =
"CLEAR_PASSPHRASE [--agent] <cache_id>\n" "CLEAR_PASSPHRASE [--mode=normal] <cache_id>\n"
"\n" "\n"
"may be used to invalidate the cache entry for a passphrase. The\n" "may be used to invalidate the cache entry for a passphrase. The\n"
"function returns with OK even when there is no cached passphrase.\n" "function returns with OK even when there is no cached passphrase.\n"
"The --agent option is used to clear an entry for a cacheid added by\n" "The --mode=normal option is used to clear an entry for a cacheid\n"
"the agent.\n"; "added by the agent.\n";
static gpg_error_t static gpg_error_t
cmd_clear_passphrase (assuan_context_t ctx, char *line) cmd_clear_passphrase (assuan_context_t ctx, char *line)
{ {
char *cacheid = NULL; char *cacheid = NULL;
char *p; char *p;
int opt_agent; int opt_normal;
opt_agent = has_option (line, "--agent"); opt_normal = has_option (line, "--mode=normal");
line = skip_options (line); line = skip_options (line);
/* parse the stuff */ /* parse the stuff */
@ -1293,8 +1293,8 @@ cmd_clear_passphrase (assuan_context_t ctx, char *line)
if (!cacheid || !*cacheid || strlen (cacheid) > 50) if (!cacheid || !*cacheid || strlen (cacheid) > 50)
return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of cacheID"); return set_error (GPG_ERR_ASS_PARAMETER, "invalid length of cacheID");
agent_put_cache (cacheid, opt_agent ? CACHE_MODE_NORMAL : CACHE_MODE_USER, agent_put_cache (cacheid, opt_normal ? CACHE_MODE_NORMAL : CACHE_MODE_USER,
NULL, 0); NULL, 0);
return 0; return 0;
} }