diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 17 | ||||
| -rw-r--r-- | g10/gpg.c | 2 | ||||
| -rw-r--r-- | g10/import.c | 5 | ||||
| -rw-r--r-- | g10/openfile.c | 2 | ||||
| -rw-r--r-- | g10/sign.c | 6 | ||||
| -rw-r--r-- | g10/status.c | 1 | ||||
| -rw-r--r-- | g10/status.h | 2 | ||||
| -rw-r--r-- | g10/textfilter.c | 3 |
8 files changed, 34 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index ab03a2aa1..8f7624d82 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,15 @@ +2006-04-03 Werner Koch <[email protected]> + + * import.c (check_prefs_warning): Merged strings for better + translation. + + * gpg.c (main) [__GLIBC__]: Default to libpcsclite.so.1. + + * status.h, status.c (STATUS_BEGIN_SIGNING): New. Suggested by + Daiki Ueno. + * textfilter.c (copy_clearsig_text): Issue new status code. + * sign.c (sign_file, sign_symencrypt_file): Ditto. + 2006-03-31 David Shaw <[email protected]> * getkey.c (get_pubkey_byname): Fix missing auto_key_retrieve @@ -17,6 +29,11 @@ This will need to come out once the standard for DSA2 is firmed up. +2006-03-28 Werner Koch <[email protected]> + + * openfile.c (overwrite_filep): Fix small cpr issue. Noted by + Daiki Ueno. + 2006-03-22 David Shaw <[email protected]> * getkey.c (parse_auto_key_locate): Silently strip out duplicates @@ -1726,6 +1726,8 @@ main (int argc, char **argv ) opt.pcsc_driver = "winscard.dll"; #elif defined(__APPLE__) opt.pcsc_driver = "/System/Library/Frameworks/PCSC.framework/PCSC"; +#elif defined(__GLIBC__) + opt.pcsc_driver = "libpcsclite.so.1"; #else opt.pcsc_driver = "libpcsclite.so"; #endif diff --git a/g10/import.c b/g10/import.c index 4ccdf5a40..3b7fa5e72 100644 --- a/g10/import.c +++ b/g10/import.c @@ -563,9 +563,8 @@ print_import_check (PKT_public_key * pk, PKT_user_id * id) static void check_prefs_warning(PKT_public_key *pk) { - log_info(_("WARNING: key %s contains preferences for unavailable\n"), - keystr_from_pk(pk)); - log_info(_("algorithms on these user IDs:\n")); + log_info(_("WARNING: key %s contains preferences for unavailable\n" + "algorithms on these user IDs:\n"), keystr_from_pk(pk)); } static void diff --git a/g10/openfile.c b/g10/openfile.c index 6970791b9..16afaf167 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -84,6 +84,8 @@ overwrite_filep( const char *fname ) return 0; /* do not overwrite */ tty_printf(_("File `%s' exists. "), fname); + if( cpr_enabled () ) + tty_printf ("\n"); if( cpr_get_answer_is_yes("openfile.overwrite.okay", _("Overwrite? (y/N) ")) ) return 1; diff --git a/g10/sign.c b/g10/sign.c index 925fef461..c0ae6c1af 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -917,7 +917,9 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, goto leave; } - /* setup the inner packet */ + write_status (STATUS_BEGIN_SIGNING); + + /* Setup the inner packet. */ if( detached ) { if( multifile ) { STRLIST sl; @@ -1283,6 +1285,8 @@ sign_symencrypt_file (const char *fname, STRLIST locusr) goto leave; } + write_status (STATUS_BEGIN_SIGNING); + /* Pipe data through all filters; i.e. write the signed stuff */ /*(current filters: zip - encrypt - armor)*/ rc = write_plaintext_packet (out, inp, fname, opt.textmode ? 't':'b'); diff --git a/g10/status.c b/g10/status.c index e9218765d..204482008 100644 --- a/g10/status.c +++ b/g10/status.c @@ -165,6 +165,7 @@ get_status_string ( int no ) case STATUS_BACKUP_KEY_CREATED:s="BACKUP_KEY_CREATED"; break; case STATUS_PKA_TRUST_BAD : s = "PKA_TRUST_BAD"; break; case STATUS_PKA_TRUST_GOOD : s = "PKA_TRUST_GOOD"; break; + case STATUS_BEGIN_SIGNING : s = "BEGIN_SIGNING"; break; default: s = "?"; break; } return s; diff --git a/g10/status.h b/g10/status.h index 3e4c7699c..bc7271dc9 100644 --- a/g10/status.h +++ b/g10/status.h @@ -118,6 +118,8 @@ #define STATUS_PKA_TRUST_BAD 82 #define STATUS_PKA_TRUST_GOOD 83 +#define STATUS_BEGIN_SIGNING 84 + /*-- status.c --*/ void set_status_fd ( int fd ); diff --git a/g10/textfilter.c b/g10/textfilter.c index 78c2bf7c1..8665a7200 100644 --- a/g10/textfilter.c +++ b/g10/textfilter.c @@ -33,6 +33,7 @@ #include "filter.h" #include "i18n.h" #include "options.h" +#include "status.h" #ifdef HAVE_DOSISH_SYSTEM #define LF "\r\n" @@ -177,6 +178,8 @@ copy_clearsig_text( IOBUF out, IOBUF inp, MD_HANDLE md, if( !escape_dash ) escape_from = 0; + write_status (STATUS_BEGIN_SIGNING); + for(;;) { maxlen = MAX_LINELEN; n = iobuf_read_line( inp, &buffer, &bufsize, &maxlen ); |