mirror of
git://git.gnupg.org/gnupg.git
synced 2025-02-01 16:33:02 +01:00
* import.c (import_one): Show the keyid when giving the Elgamal slow
import warning. * g10.c (main): Older versions used --comment "" to indicate no comment. Don't add an empty comment.
This commit is contained in:
parent
837df305c6
commit
6ad91b2b3a
@ -1,3 +1,11 @@
|
||||
2003-10-14 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* import.c (import_one): Show the keyid when giving the Elgamal
|
||||
slow import warning.
|
||||
|
||||
* g10.c (main): Older versions used --comment "" to indicate no
|
||||
comment. Don't add an empty comment.
|
||||
|
||||
2003-10-13 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyedit.c (show_key_with_all_names): Ownertrust is only
|
||||
|
@ -1658,7 +1658,10 @@ main( int argc, char **argv )
|
||||
break;
|
||||
case oSigKeyserverURL: add_keyserver_url(pargs.r.ret_str,0); break;
|
||||
case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break;
|
||||
case oComment: add_to_strlist(&opt.comments,pargs.r.ret_str); break;
|
||||
case oComment:
|
||||
if(pargs.r.ret_str[0])
|
||||
add_to_strlist(&opt.comments,pargs.r.ret_str);
|
||||
break;
|
||||
case oDefaultComment:
|
||||
deprecated_warning(configname,configlineno,
|
||||
"--default-comment","--no-comments","");
|
||||
|
@ -560,8 +560,8 @@ import_one( const char *fname, KBNODE keyblock,
|
||||
uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
|
||||
|
||||
if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
|
||||
log_info(_("NOTE: Elgamal primary key detected - "
|
||||
"this may take some time to import\n"));
|
||||
log_info(_("key %08lX: Elgamal primary key -"
|
||||
" this may take some time to import\n"),(ulong)keyid[1]);
|
||||
|
||||
if( opt.verbose && !opt.interactive ) {
|
||||
log_info( "pub %4u%c/%08lX %s ",
|
||||
|
Loading…
x
Reference in New Issue
Block a user