security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-18 14:17:03 +01:00
Code Activity

2002-08-16 Timo Schulz <ts@winpt.org>

Browse Source 
* g10.c (main): enable opt.interactive.

        * import.c (import_one): Ask the user if the key shall be
        imported when the interactive mode is used. Useful to extract
        selected keys from a file.
This commit is contained in:
Timo Schulz 2002-08-18 17:24:21 +00:00
parent 47fc9f88a2
commit 5201d1ec9d
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2002-08-16 Timo Schulz <ts@winpt.org>
* g10.c (main): enable opt.interactive.
* import.c (import_one): Ask the user if the key shall be
imported when the interactive mode is used. Useful to extract
selected keys from a file.
2002-08-16 Werner Koch <wk@gnupg.org> 2002-08-16 Werner Koch <wk@gnupg.org>
* seckey-cert.c: Workaround to allow decryption of v3 keys created * seckey-cert.c: Workaround to allow decryption of v3 keys created

2
g10/g10.c
View File

@ -403,7 +403,7 @@ static ARGPARSE_OPTS opts[] = {
{ oDisableMDC, "disable-mdc", 0, N_("never use a MDC for encryption") }, { oDisableMDC, "disable-mdc", 0, N_("never use a MDC for encryption") },
{ oNoDisableMDC, "no-disable-mdc", 0, "@" }, { oNoDisableMDC, "no-disable-mdc", 0, "@" },
{ oDryRun, "dry-run", 0, N_("do not make any changes") }, { oDryRun, "dry-run", 0, N_("do not make any changes") },
/*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */ { oInteractive, "interactive", 0, N_("prompt before overwriting") },
{ oUseAgent, "use-agent",0, N_("use the gpg-agent")}, { oUseAgent, "use-agent",0, N_("use the gpg-agent")},
{ oNoUseAgent, "no-use-agent",0, "@"}, { oNoUseAgent, "no-use-agent",0, "@"},
{ oGpgAgentInfo, "gpg-agent-info",2, "@"}, { oGpgAgentInfo, "gpg-agent-info",2, "@"},

17
g10/import.c
View File

@ -641,6 +641,23 @@ import_one( const char *fname, KBNODE keyblock, int fast,
log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]); log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
return 0; return 0;
} }
if( opt.interactive ) {
char *prompt, *p;
size_t n = 0;
p = get_user_id( pk->keyid, &n );
prompt = m_alloc( n + 16 + 128 + 1 );
snprintf( prompt, n + 16 + 128,
"Do you want to import %08lX \"%s\" ? (y/n) ",
(ulong)keyid[1], p );
m_free( p );
if( !cpr_get_answer_is_yes( "import.okay", prompt ) ) {
m_free( prompt );
return 0;
}
m_free( prompt );
}
clear_kbnode_flags( keyblock ); clear_kbnode_flags( keyblock );