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

See ChangeLog: Wed Sep 1 15:30:44 CEST 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-09-01 13:40:07 +00:00
parent 88a916cdd4
commit 0428ca6da6
19 changed files with 290 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/ChangeLog
View file

@ -1,3 +1,9 @@
Wed Sep 1 15:30:44 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* keygen.c (ask_expire_interval): Fixed bug related to cpr_xx (tnx
Francis J. Lacoste).
Tue Aug 31 17:20:44 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>

8
g10/getkey.c
View file

@ -1288,7 +1288,7 @@ find_by_name( KBNODE keyblock, PKT_public_key *pk, const char *name,
else if( is_RSA(pk->pubkey_algo) )
log_error(_("RSA key cannot be used in this version\n"));
else
log_error(_("No key for user-id\n"));
log_error(_("No key for user ID\n"));
}
}
return NULL;
@ -1327,7 +1327,7 @@ find_by_name_sk( KBNODE keyblock, PKT_secret_key *sk, const char *name,
else if( is_RSA(sk->pubkey_algo) )
log_error(_("RSA key cannot be used in this version\n"));
else
log_error(_("No key for user-id\n"));
log_error(_("No key for user ID\n"));
}
}
return NULL;
@ -1366,7 +1366,7 @@ find_by_keyid( KBNODE keyblock, PKT_public_key *pk, u32 *keyid, int mode )
if( kk )
cache_user_id( kk->pkt->pkt.user_id, aki );
else
log_error(_("No user-id for key\n"));
log_error(_("No user ID for key\n"));
return k; /* found */
}
}
@ -1406,7 +1406,7 @@ find_by_keyid_sk( KBNODE keyblock, PKT_secret_key *sk, u32 *keyid, int mode )
if( kk )
cache_user_id( kk->pkt->pkt.user_id, aki );
else
log_error(_("No user-id for key\n"));
log_error(_("No user ID for key\n"));
return k; /* found */
}
}

2
g10/helptext.c
View file

@ -58,7 +58,7 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = {
)},
{ "pklist.user_id.enter", N_(
"Enter the user id of the addressee to whom you want to send the message."
"Enter the user ID of the addressee to whom you want to send the message."
)},
{ "keygen.algo", N_(

18
g10/import.c
View file

@ -359,7 +359,7 @@ import_one( const char *fname, KBNODE keyblock, int fast )
putc('\n', stderr);
}
if( !uidnode ) {
log_error( _("key %08lX: no user id\n"), (ulong)keyid[1]);
log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
return 0;
}
@ -373,7 +373,7 @@ import_one( const char *fname, KBNODE keyblock, int fast )
if( !delete_inv_parts( fname, keyblock, keyid ) ) {
if( !opt.quiet ) {
log_info( _("key %08lX: no valid user ids\n"),
log_info( _("key %08lX: no valid user IDs\n"),
(ulong)keyid[1]);
log_info(_("this may be caused by a missing self-signature\n"));
}
@ -466,10 +466,10 @@ import_one( const char *fname, KBNODE keyblock, int fast )
/* we are ready */
if( !opt.quiet ) {
if( n_uids == 1 )
log_info( _("key %08lX: 1 new user-id\n"),
log_info( _("key %08lX: 1 new user ID\n"),
(ulong)keyid[1]);
else if( n_uids )
log_info( _("key %08lX: %d new user-ids\n"),
log_info( _("key %08lX: %d new user IDs\n"),
(ulong)keyid[1], n_uids );
if( n_sigs == 1 )
log_info( _("key %08lX: 1 new signature\n"),
@ -551,7 +551,7 @@ import_secret_one( const char *fname, KBNODE keyblock )
}
stats.secret_read++;
if( !uidnode ) {
log_error( _("key %08lX: no user id\n"), (ulong)keyid[1]);
log_error( _("key %08lX: no user ID\n"), (ulong)keyid[1]);
return 0;
}
@ -708,7 +708,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
if( (sig->sig_class&~3) == 0x10 ) {
KBNODE unode = find_prev_kbnode( keyblock, n, PKT_USER_ID );
if( !unode ) {
log_error( _("key %08lX: no user-id for signature\n"),
log_error( _("key %08lX: no user ID for signature\n"),
(ulong)keyid[1]);
return -1; /* the complete keyblock is invalid */
}
@ -766,7 +766,7 @@ mark_non_selfsigned_uids_valid( KBNODE keyblock, u32 *kid )
if( node->pkt->pkttype == PKT_USER_ID && !(node->flag & 1) ) {
if( node->next && node->next->pkt->pkttype == PKT_SIGNATURE ) {
node->flag |= 1;
log_info( _("key %08lX: accepted non self-signed user-id '"),
log_info( _("key %08lX: accepted non self-signed user ID '"),
(ulong)kid[1]);
print_string( log_stream(), node->pkt->pkt.user_id->name,
node->pkt->pkt.user_id->len, 0 );
@ -795,7 +795,7 @@ delete_inv_parts( const char *fname, KBNODE keyblock, u32 *keyid )
uid_seen = 1;
if( (node->flag & 2) || !(node->flag & 1) ) {
if( opt.verbose ) {
log_info( _("key %08lX: skipped user-id '"),
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 );
@ -1176,7 +1176,7 @@ merge_sigs( KBNODE dst, KBNODE src, int *n_sigs,
assert(dst->pkt->pkttype == PKT_USER_ID );
assert(src->pkt->pkttype == PKT_USER_ID );
/* at least a self signature comes next to the user-ids */
/* at least a self signature comes next to the user IDs */
assert(src->next->pkt->pkttype != PKT_USER_ID );
if( dst->next->pkt->pkttype == PKT_USER_ID ) {
log_error( _("key %08lX: our copy has no self-signature\n"),

28
g10/keyedit.c
View file

@ -228,9 +228,9 @@ check_all_keysigs( KBNODE keyblock, int only_selected )
else if( oth_err )
tty_printf(_("%d signatures not checked due to errors\n"), oth_err );
if( mis_selfsig == 1 )
tty_printf(_("1 user id without valid self-signature detected\n"));
tty_printf(_("1 user ID without valid self-signature detected\n"));
else if( mis_selfsig )
tty_printf(_("%d user ids without valid self-signatures detected\n"),
tty_printf(_("%d user IDs without valid self-signatures detected\n"),
mis_selfsig);
return inv_sigs || no_key || oth_err || mis_selfsig;
@ -567,9 +567,9 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
{ N_("help") , cmdHELP , 0,1, N_("show this help") },
{ "?" , cmdHELP , 0,1, NULL },
{ N_("fpr") , cmdFPR , 0,1, N_("show fingerprint") },
{ N_("list") , cmdLIST , 0,1, N_("list key and user ids") },
{ N_("list") , cmdLIST , 0,1, N_("list key and user IDs") },
{ N_("l") , cmdLIST , 0,1, NULL },
{ N_("uid") , cmdSELUID , 0,1, N_("select user id N") },
{ N_("uid") , cmdSELUID , 0,1, N_("select user ID N") },
{ N_("key") , cmdSELKEY , 0,0, N_("select secondary key N") },
{ N_("check") , cmdCHECK , 0,1, N_("list signatures") },
{ N_("c") , cmdCHECK , 0,1, NULL },
@ -577,8 +577,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
{ N_("s") , cmdSIGN , 0,1, NULL },
{ N_("lsign") , cmdLSIGN , 0,1, N_("sign the key locally") },
{ N_("debug") , cmdDEBUG , 0,0, NULL },
{ N_("adduid") , cmdADDUID , 1,0, N_("add a user id") },
{ N_("deluid") , cmdDELUID , 0,0, N_("delete user id") },
{ N_("adduid") , cmdADDUID , 1,0, N_("add a user ID") },
{ N_("deluid") , cmdDELUID , 0,0, N_("delete user ID") },
{ N_("addkey") , cmdADDKEY , 1,0, N_("add a secondary key") },
{ N_("delkey") , cmdDELKEY , 0,0, N_("delete a secondary key") },
{ N_("delsig") , cmdDELSIG , 0,0, N_("delete signatures") },
@ -755,8 +755,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
case cmdLSIGN: /* sign (only the public key) */
if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock) ) {
if( !cpr_get_answer_is_yes("keyedit.sign_all.okay",
_("Really sign all user ids? ")) ) {
tty_printf(_("Hint: Select the user ids to sign\n"));
_("Really sign all user IDs? ")) ) {
tty_printf(_("Hint: Select the user IDs to sign\n"));
break;
}
}
@ -794,13 +794,13 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
int n1;
if( !(n1=count_selected_uids(keyblock)) )
tty_printf(_("You must select at least one user id.\n"));
tty_printf(_("You must select at least one user ID.\n"));
else if( count_uids(keyblock) - n1 < 1 )
tty_printf(_("You can't delete the last user id!\n"));
tty_printf(_("You can't delete the last user ID!\n"));
else if( cpr_get_answer_is_yes(
"keyedit.remove.uid.okay",
n1 > 1? _("Really remove all selected user ids? ")
: _("Really remove this user id? ")
n1 > 1? _("Really remove all selected user IDs? ")
: _("Really remove this user ID? ")
) ) {
menu_deluid( keyblock, sec_keyblock );
redisplay = 1;
@ -815,7 +815,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
int n1;
if( !(n1=count_selected_uids(keyblock)) )
tty_printf(_("You must select at least one user id.\n"));
tty_printf(_("You must select at least one user ID.\n"));
else if( menu_delsig( keyblock ) ) {
/* no redisplay here, because it may scroll away some
* status output of delsig */
@ -1563,7 +1563,7 @@ menu_select_uid( KBNODE keyblock, int idx )
}
}
if( !node ) {
tty_printf(_("No user id with index %d\n"), idx );
tty_printf(_("No user ID with index %d\n"), idx );
return 0;
}
}

5
g10/keygen.c
View file

@ -559,9 +559,8 @@ ask_expire_interval(void)
asctimestamp(curtime + interval ) );
}
if( !cpr_enabled()
&& cpr_get_answer_is_yes("keygen.valid.okay",
_("Is this correct (y/n)? ")) )
if( cpr_enabled() || cpr_get_answer_is_yes("keygen.valid.okay",
_("Is this correct (y/n)? ")) )
break;
}
m_free(answer);

2
g10/mainproc.c
View file

@ -124,7 +124,7 @@ static int
add_user_id( CTX c, PACKET *pkt )
{
if( !c->list ) {
log_error("orphaned user id\n" );
log_error("orphaned user ID\n" );
return 0;
}
add_kbnode( c->list, new_kbnode( pkt ) );

8
g10/parse-packet.c
View file

@ -793,7 +793,7 @@ dump_sig_subpkt( int hashed, int type, int critical,
p = "preferred key server";
break;
case SIGSUBPKT_PRIMARY_UID:
p = "primary user id";
p = "primary user ID";
break;
case SIGSUBPKT_POLICY:
fputs("policy: ", stdout );
@ -803,10 +803,10 @@ dump_sig_subpkt( int hashed, int type, int critical,
p = "key flags";
break;
case SIGSUBPKT_SIGNERS_UID:
p = "signer's user id";
p = "signer's user ID";
break;
case SIGSUBPKT_PRIV_ADD_SIG:
p = "signs additional user id";
p = "signs additional user ID";
break;
default: p = "?"; break;
}
@ -1482,7 +1482,7 @@ parse_user_id( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
if( list_mode ) {
int n = packet->pkt.user_id->len;
printf(":user id packet: \"");
printf(":user ID packet: \"");
/* fixme: Hey why don't we replace this wioth print_string?? */
for(p=packet->pkt.user_id->name; n; p++, n-- ) {
if( *p >= ' ' && *p <= 'z' )

2
g10/sig-check.c
View file

@ -505,7 +505,7 @@ check_key_signature2( KBNODE root, KBNODE node, int *is_selfsig, u32 *r_expire)
md_close(md);
}
else {
log_error("no user id for key signature packet\n");
log_error("no user ID for key signature packet\n");
rc = G10ERR_SIG_CLASS;
}
}

2
g10/trustdb.c
View file

@ -2058,7 +2058,7 @@ do_check( TRUSTREC *dr, unsigned *validity,
return G10ERR_TRUSTDB;
}
if( !dr->r.dir.uidlist ) {
log_error(_("Ooops, no user ids\n"));
log_error(_("Ooops, no user IDs\n"));
return G10ERR_TRUSTDB;
}