gnupg/g10 (7 files)
cvs user dshaw
cvs at cvs.gnupg.org
Thu Oct 28 03:54:02 CEST 2004
Date: Thursday, October 28, 2004 @ 03:58:01
Author: dshaw
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog delkey.c export.c keyedit.c pkclist.c revoke.c
skclist.c
* delkey.c, export.c, keyedit.c, pkclist.c, revoke.c, skclist.c: Fix a few
missed possible \"username\" quotes.
-----------+
ChangeLog | 5 +++++
delkey.c | 2 +-
export.c | 2 +-
keyedit.c | 23 +++++++++++++----------
pkclist.c | 2 +-
revoke.c | 11 ++++++-----
skclist.c | 36 +++++++++++++++++++++---------------
7 files changed, 48 insertions(+), 33 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.628 gnupg/g10/ChangeLog:1.629
--- gnupg/g10/ChangeLog:1.628 Tue Oct 26 09:50:47 2004
+++ gnupg/g10/ChangeLog Thu Oct 28 03:58:01 2004
@@ -1,3 +1,8 @@
+2004-10-27 David Shaw <dshaw at jabberwocky.com>
+
+ * delkey.c, export.c, keyedit.c, pkclist.c, revoke.c, skclist.c:
+ Fix a few missed possible \"username\" quotes.
+
2004-10-26 Werner Koch <wk at g10code.com>
* app-openpgp.c (verify_chv3): The minimum length for CHV3 is
Index: gnupg/g10/delkey.c
diff -u gnupg/g10/delkey.c:1.17 gnupg/g10/delkey.c:1.18
--- gnupg/g10/delkey.c:1.17 Sun Oct 10 17:27:14 2004
+++ gnupg/g10/delkey.c Thu Oct 28 03:58:01 2004
@@ -71,7 +71,7 @@
|| desc.mode == KEYDB_SEARCH_MODE_FPR20);
rc = desc.mode? keydb_search (hd, &desc, 1):G10ERR_INV_USER_ID;
if (rc) {
- log_error (_("key `%s' not found: %s\n"), username, g10_errstr (rc));
+ log_error (_("key \"%s\" not found: %s\n"), username, g10_errstr (rc));
write_status_text( STATUS_DELETE_PROBLEM, "1" );
goto leave;
}
Index: gnupg/g10/export.c
diff -u gnupg/g10/export.c:1.40 gnupg/g10/export.c:1.41
--- gnupg/g10/export.c:1.40 Thu Oct 14 12:48:15 2004
+++ gnupg/g10/export.c Thu Oct 28 03:58:01 2004
@@ -159,7 +159,7 @@
if (classify_user_id (sl->d, desc+ndesc))
ndesc++;
else
- log_error (_("key `%s' not found: %s\n"),
+ log_error (_("key \"%s\" not found: %s\n"),
sl->d, g10_errstr (G10ERR_INV_USER_ID));
}
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.153 gnupg/g10/keyedit.c:1.154
--- gnupg/g10/keyedit.c:1.153 Fri Oct 15 15:16:57 2004
+++ gnupg/g10/keyedit.c Thu Oct 28 03:58:01 2004
@@ -1338,18 +1338,21 @@
afp[an++] = 0;
rc = keydb_search_fpr (sec_kdbhd, afp);
}
- if (!rc) {
+ if (!rc)
+ {
rc = keydb_get_keyblock (sec_kdbhd, &sec_keyblock);
- if (rc) {
- log_error (_("error reading secret keyblock `%s': %s\n"),
- username, g10_errstr(rc));
- }
- else {
+ if (rc)
+ {
+ log_error (_("error reading secret keyblock \"%s\": %s\n"),
+ username, g10_errstr(rc));
+ }
+ else
+ {
merge_keys_and_selfsig( sec_keyblock );
if( fix_keyblock( sec_keyblock ) )
- sec_modified++;
- }
- }
+ sec_modified++;
+ }
+ }
if (rc) {
sec_keyblock = NULL;
@@ -2914,7 +2917,7 @@
rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL,1);
if(rc)
{
- log_error (_("key `%s' not found: %s\n"),answer,g10_errstr(rc));
+ log_error (_("key \"%s\" not found: %s\n"),answer,g10_errstr(rc));
m_free(answer);
continue;
}
Index: gnupg/g10/pkclist.c
diff -u gnupg/g10/pkclist.c:1.105 gnupg/g10/pkclist.c:1.106
--- gnupg/g10/pkclist.c:1.105 Fri Oct 15 11:39:25 2004
+++ gnupg/g10/pkclist.c Thu Oct 28 03:58:01 2004
@@ -900,7 +900,7 @@
/* The default recipient may be disabled */
rc = get_pubkey_byname( pk, def_rec, NULL, NULL, 1 );
if( rc )
- log_error(_("unknown default recipient `%s'\n"), def_rec );
+ log_error(_("unknown default recipient \"%s\"\n"), def_rec );
else if( !(rc=check_pubkey_algo2(pk->pubkey_algo, use)) ) {
/* Mark any_recipients here since the default recipient
would have been used if it wasn't already there. It
Index: gnupg/g10/revoke.c
diff -u gnupg/g10/revoke.c:1.39 gnupg/g10/revoke.c:1.40
--- gnupg/g10/revoke.c:1.39 Sun Oct 10 17:27:14 2004
+++ gnupg/g10/revoke.c Thu Oct 28 03:58:01 2004
@@ -222,7 +222,7 @@
classify_user_id (uname, &desc);
rc = desc.mode? keydb_search (kdbhd, &desc, 1) : G10ERR_INV_USER_ID;
if (rc) {
- log_error (_("key `%s' not found: %s\n"),uname, g10_errstr (rc));
+ log_error (_("key \"%s\" not found: %s\n"),uname, g10_errstr (rc));
goto leave;
}
@@ -372,7 +372,7 @@
}
if(!any)
- log_error(_("no revocation keys found for `%s'\n"),uname);
+ log_error(_("no revocation keys found for \"%s\"\n"),uname);
leave:
if( pk )
@@ -425,11 +425,12 @@
kdbhd = keydb_new (1);
classify_user_id (uname, &desc);
rc = desc.mode? keydb_search (kdbhd, &desc, 1) : G10ERR_INV_USER_ID;
- if (rc) {
- log_error (_("secret key `%s' not found: %s\n"),
+ if (rc)
+ {
+ log_error (_("secret key \"%s\" not found: %s\n"),
uname, g10_errstr (rc));
goto leave;
- }
+ }
rc = keydb_get_keyblock (kdbhd, &keyblock );
if( rc ) {
Index: gnupg/g10/skclist.c
diff -u gnupg/g10/skclist.c:1.25 gnupg/g10/skclist.c:1.26
--- gnupg/g10/skclist.c:1.25 Thu Feb 26 03:03:27 2004
+++ gnupg/g10/skclist.c Thu Oct 28 03:58:01 2004
@@ -153,34 +153,40 @@
* won't catch all duplicates because the user IDs may be
* specified in different ways.
*/
- if ( is_duplicated_entry ( locusr_orig, locusr ) ) {
- log_error(_("skipped `%s': duplicated\n"), locusr->d );
+ if ( is_duplicated_entry ( locusr_orig, locusr ) )
+ {
+ log_error(_("skipped \"%s\": duplicated\n"), locusr->d );
continue;
- }
+ }
sk = m_alloc_clear( sizeof *sk );
sk->req_usage = use;
- if( (rc = get_seckey_byname( sk, locusr->d, 0 )) ) {
+ if( (rc = get_seckey_byname( sk, locusr->d, 0 )) )
+ {
free_secret_key( sk ); sk = NULL;
- log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
- }
+ log_error(_("skipped \"%s\": %s\n"),
+ locusr->d, g10_errstr(rc) );
+ }
else if ( key_present_in_sk_list(sk_list, sk) == 0) {
free_secret_key(sk); sk = NULL;
log_info(_("skipped: secret key already present\n"));
}
- else if ( unlock && (rc = check_secret_key( sk, 0 )) ) {
+ else if ( unlock && (rc = check_secret_key( sk, 0 )) )
+ {
free_secret_key( sk ); sk = NULL;
- log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
- }
+ log_error(_("skipped \"%s\": %s\n"),
+ locusr->d, g10_errstr(rc) );
+ }
else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, use)) ) {
SK_LIST r;
if( sk->version == 4 && (use & PUBKEY_USAGE_SIG)
- && sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
- log_info(_("skipped `%s': this is a PGP generated "
- "Elgamal key which is not secure for signatures!\n"),
- locusr->d );
+ && sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E )
+ {
+ log_info(_("skipped \"%s\": %s\n"),locusr->d,
+ _("this is a PGP generated Elgamal key which"
+ " is not secure for signatures!"));
free_secret_key( sk ); sk = NULL;
- }
+ }
else if( random_is_faked() && !is_insecure( sk ) ) {
log_info(_("key is not flagged as insecure - "
"can't use it with the faked RNG!\n"));
@@ -196,7 +202,7 @@
}
else {
free_secret_key( sk ); sk = NULL;
- log_error("skipped `%s': %s\n", locusr->d, g10_errstr(rc) );
+ log_error("skipped \"%s\": %s\n", locusr->d, g10_errstr(rc) );
}
}
}
More information about the Gnupg-commits
mailing list