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

About to release 1.4.3

Browse source
This commit is contained in:
Werner Koch 2006-04-03 10:13:23 +00:00
parent 4afa4eb10e
commit 256f67675f
43 changed files with 10662 additions and 10109 deletions
Download patch file Download diff file Expand all files Collapse all files

17
g10/ChangeLog
View file

@ -1,3 +1,15 @@
2006-04-03 Werner Koch <wk@g10code.com>
* 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 <dshaw@jabberwocky.com>
* 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 <wk@g10code.com>
* openfile.c (overwrite_filep): Fix small cpr issue. Noted by
Daiki Ueno.
2006-03-22 David Shaw <dshaw@jabberwocky.com>
* getkey.c (parse_auto_key_locate): Silently strip out duplicates

2
g10/gpg.c
View file

@ -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

5
g10/import.c
View file

@ -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

2
g10/openfile.c
View file

@ -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;

6
g10/sign.c
View file

@ -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');

1
g10/status.c
View file

@ -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;

2
g10/status.h
View file

@ -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 );

3
g10/textfilter.c
View file

@ -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 );