diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/OPTIONS | 2 | ||||
| -rw-r--r-- | g10/import.c | 12 | ||||
| -rw-r--r-- | g10/mainproc.c | 8 | ||||
| -rw-r--r-- | g10/trustdb.c | 2 |
5 files changed, 21 insertions, 10 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 1c7d94043..f5753ac8c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 22 13:50:24 CET 2000 Werner Koch <[email protected]> + + * mainproc.c (print_userid): Do UTF8 conversion before printing. + * import.c (import_one): Ditto. + (import_secret_one): Ditto. + (delete_inv_parts): Ditto. + Thu Mar 16 16:20:23 CET 2000 Werner Koch <[email protected]> * keylist.c (print_key_data): Handle a NULL pk gracefully. diff --git a/g10/OPTIONS b/g10/OPTIONS index 96290f6cf..b1a49e254 100644 --- a/g10/OPTIONS +++ b/g10/OPTIONS @@ -19,6 +19,6 @@ compress-sigs run-as-shm-coprocess [request-locked-shm-size] # very special :-) # You will have to use "--status-fd" too -# Note: This option dioes only work if given on the command line. +# Note: This option does only work if given on the command line. diff --git a/g10/import.c b/g10/import.c index 78a1cfc8a..b210668f7 100644 --- a/g10/import.c +++ b/g10/import.c @@ -378,8 +378,8 @@ import_one( const char *fname, KBNODE keyblock, int fast ) pubkey_letter( pk->pubkey_algo ), (ulong)keyid[1], datestr_from_pk(pk) ); if( uidnode ) - print_string( stderr, uidnode->pkt->pkt.user_id->name, - uidnode->pkt->pkt.user_id->len, 0 ); + print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name, + uidnode->pkt->pkt.user_id->len ); putc('\n', stderr); } if( !uidnode ) { @@ -569,8 +569,8 @@ import_secret_one( const char *fname, KBNODE keyblock ) pubkey_letter( sk->pubkey_algo ), (ulong)keyid[1], datestr_from_sk(sk) ); if( uidnode ) - print_string( stderr, uidnode->pkt->pkt.user_id->name, - uidnode->pkt->pkt.user_id->len, 0 ); + print_utf8_string( stderr, uidnode->pkt->pkt.user_id->name, + uidnode->pkt->pkt.user_id->len ); putc('\n', stderr); } stats.secret_read++; @@ -831,8 +831,8 @@ delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid ) if( opt.verbose ) { log_info( _("key %08lX: skipped user ID '"), (ulong)keyid[1]); - print_string( stderr, node->pkt->pkt.user_id->name, - node->pkt->pkt.user_id->len, 0 ); + print_utf8_string( stderr, node->pkt->pkt.user_id->name, + node->pkt->pkt.user_id->len ); fputs("'\n", stderr ); } delete_kbnode( node ); /* the user-id */ diff --git a/g10/mainproc.c b/g10/mainproc.c index 99bf05ab3..0b52ef72d 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -552,8 +552,12 @@ print_userid( PACKET *pkt ) printf("ERROR: unexpected packet type %d", pkt->pkttype ); return; } - print_string( stdout, pkt->pkt.user_id->name, pkt->pkt.user_id->len, - opt.with_colons ); + if( opt.with_colons ) + print_string( stdout, pkt->pkt.user_id->name, + pkt->pkt.user_id->len, ':'); + else + print_utf8_string( stdout, pkt->pkt.user_id->name, + pkt->pkt.user_id->len ); } diff --git a/g10/trustdb.c b/g10/trustdb.c index 192f3d897..1520d9d6c 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -483,7 +483,7 @@ verify_own_keys(void) if( DBG_TRUST ) log_debug("key %08lX: checking secret key\n", (ulong)keyid[1] ); - if( is_secret_key_protected( sk ) < 1 ) + if( !opt.quiet && is_secret_key_protected( sk ) < 1 ) log_info(_("NOTE: secret key %08lX is NOT protected.\n"), (ulong)keyid[1] ); |