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

* main.h: Create S2K_DIGEST_ALGO macro so we do not need to always set

Browse source 
opt.s2k_digest_algo.  This helps fix a problem with PGP 2.x encrypted
symmetric messages.  Change all callers (encode.c, g10.c, keyedit.c,
keygen.c, passphrase.c, sign.c).

* armor.c, cardglue.c, getkey.c, import.c, keygen.c: Be consistent in some
more quoted strings.  Always use 'user ID', not 'user id', "quotes" for
user IDs, etc.
This commit is contained in:
David Shaw 2004-09-24 20:34:38 +00:00
parent 680be9be10
commit 4d26ab92cc
12 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
g10/import.c
View file

@ -719,7 +719,7 @@ import_one( const char *fname, KBNODE keyblock,
char *user=utf8_to_native(node->pkt->pkt.user_id->name,
node->pkt->pkt.user_id->len,0);
node->flag |= 1;
log_info( _("key %s: accepted non self-signed user ID '%s'\n"),
log_info( _("key %s: accepted non self-signed user ID \"%s\"\n"),
keystr_from_pk(pk),user);
m_free(user);
}
@ -1297,9 +1297,9 @@ chk_self_sigs( const char *fname, KBNODE keyblock,
strlen(unode->pkt->pkt.user_id->name),0);
log_info( rc == G10ERR_PUBKEY_ALGO ?
_("key %s: unsupported public key "
"algorithm on user id \"%s\"\n"):
"algorithm on user ID \"%s\"\n"):
_("key %s: invalid self-signature "
"on user id \"%s\"\n"),
"on user ID \"%s\"\n"),
keystr(keyid),p);
m_free(p);
}
@ -1436,7 +1436,7 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
{
char *p=utf8_to_native(node->pkt->pkt.user_id->name,
node->pkt->pkt.user_id->len,0);
log_info( _("key %s: skipped user ID '%s'\n"),
log_info( _("key %s: skipped user ID \"%s\"\n"),
keystr(keyid),p);
m_free(p);
}
@ -1485,7 +1485,7 @@ delete_inv_parts( const char *fname, KBNODE keyblock,
* seems that this makes sense */
if(opt.verbose)
log_info( _("key %s: non exportable signature"
" (class %02x) - skipped\n"),
" (class 0x%02X) - skipped\n"),
keystr(keyid), node->pkt->pkt.signature->sig_class );
delete_kbnode( node );
}