summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-07-26 09:44:46 +0200
committerWerner Koch <wk@gnupg.org>1999-07-26 09:44:46 +0200
commit4dbfb24dbb3652b3b73d97d3fee3df5c968aa358 (patch)
tree6841adaa29b9aa8803f9b5ea746690f35c1a4a45
parent. (diff)
downloadgnupg2-4dbfb24dbb3652b3b73d97d3fee3df5c968aa358.tar.xz
gnupg2-4dbfb24dbb3652b3b73d97d3fee3df5c968aa358.zip
See ChangeLog: Mon Jul 26 09:34:46 CEST 1999 Werner Koch
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am7
-rw-r--r--NOTES13
-rw-r--r--THANKS1
-rw-r--r--VERSION2
-rw-r--r--acinclude.m41
-rw-r--r--checks/Makefile.am2
-rw-r--r--cipher/ChangeLog5
-rw-r--r--cipher/md5.c5
-rw-r--r--doc/gpg.sgml12
-rw-r--r--g10/ChangeLog22
-rw-r--r--g10/encode.c144
-rw-r--r--g10/g10.c23
-rw-r--r--g10/getkey.c12
-rw-r--r--g10/import.c4
-rw-r--r--g10/options.h2
-rw-r--r--g10/pkclist.c2
-rw-r--r--g10/sign.c66
-rw-r--r--g10/trustdb.c2
-rw-r--r--po/ChangeLog6
-rw-r--r--po/de.po2
-rw-r--r--po/es_ES.po2
-rw-r--r--po/fr.po2
-rw-r--r--po/it.po191
-rw-r--r--po/pl.po2
-rw-r--r--po/pt_BR.po2
-rw-r--r--po/ru.po2
27 files changed, 303 insertions, 238 deletions
diff --git a/ChangeLog b/ChangeLog
index 302812aab..b92ca4be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): remove init of ac_cv_...
+
+ * Makefile.am (DISCLEANFILES): New
+
Fri Jul 23 13:53:03 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/Makefile.am b/Makefile.am
index 0868a48cb..e3add598e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,18 @@
if COMPILE_LIBGCRYPT
gcrypt = gcrypt
+my_clean_gcrypt =
else
gcrypt =
+my_clean_gcrypt = gcrypt/Makefile
endif
SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks ${gcrypt}
EXTRA_DIST = VERSION PROJECTS BUGS
-
+# gettext never gets it right, so we take here care of deleting the
+# symlink. my_clean_gcrypt is just a kludge until we can include
+# libgcrypt.
+DISTCLEANFILES = g10defs.h intl/libintl.h ${my_clean_gcrypt}
dist-hook:
@set -e; \
diff --git a/NOTES b/NOTES
new file mode 100644
index 000000000..47a69df47
--- /dev/null
+++ b/NOTES
@@ -0,0 +1,13 @@
+
+
+SCO UnixWare/7.1.0 reported by Allan Clark <allanc@sco.com> for 0.9.8
+
+
+Some other reported cpu-vendor-os strings:
+
+ hppa1.1-hp-hpux10.20
+ mips-sgi-irix6.2
+ sparc-sun-solaris5.4
+ sparc-sun-sunos4.1.2
+ i386-pc-sysv4.2 (USL Unixware v1.1.2)
+
diff --git a/THANKS b/THANKS
index d69fc4ef1..c078d197c 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ reporting problems, suggesting various improvements or submitting actual
code. Here is a list of those people. Help me keep it complete and free of
errors.
+Allan Clark allanc@sco.com
Anand Kumria wildfire@progsoc.uts.edu.au
Ariel T Glenn ariel@columbia.edu
Bodo Moeller Bodo_Moeller@public.uni-hamburg.de
diff --git a/VERSION b/VERSION
index 7e310bae1..36f77eef1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.9
+0.9.9a
diff --git a/acinclude.m4 b/acinclude.m4
index 7e549143c..5b00dc0bd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -575,7 +575,6 @@ case "${target}" in
esac
if test "$tmp_do_check" = "yes"; then
-ac_cv_sys_symbol_underscore=""
AC_REQUIRE([GNUPG_PROG_NM])dnl
AC_REQUIRE([GNUPG_SYS_NM_PARSE])dnl
AC_MSG_CHECKING([for _ prefix in compiled symbols])
diff --git a/checks/Makefile.am b/checks/Makefile.am
index df2a330cc..bda0a2d90 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = defs.inc run-gpg run-gpg.patterns $(TESTS) $(TEST_FILES) \
CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \
plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* \
pubring.gpg secring.gpg pubring.pkr secring.skr
-
+DISTCLEANFILES = pubring.gpg~
all-local: prepared.stamp
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index ae4b51e7c..5c6f4a5e8 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * md5.c (md5_final): Fix for a SCO cpp bug.
+
Thu Jul 15 10:15:35 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/cipher/md5.c b/cipher/md5.c
index a3725466b..035eaf11b 100644
--- a/cipher/md5.c
+++ b/cipher/md5.c
@@ -301,7 +301,10 @@ md5_final( MD5_CONTEXT *hd )
#define X(a) do { *p++ = hd->##a ; *p++ = hd->##a >> 8; \
*p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0)
#else /* little endian */
- #define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)
+ /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/
+ /* Unixware's cpp doesn't like the above construct so we do it his way:
+ * (reported by Allan Clark) */
+ #define X(a) do { *(u32*)p = (*hd).a ; p += 4; } while(0)
#endif
X(A);
X(B);
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 344cefc67..67b07db9f 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1190,6 +1190,18 @@ Same as the command --fingerprint but changes only the format of the output
and may be used together with another command.
</para></listitem></varlistentry>
+<varlistentry>
+<term>--no-literal</term>
+<listitem><para>
+This is not for normal use. Use the source to see for it might be used for.
+</para></listitem></varlistentry>
+
+<varlistentry>
+<term>--set-filesize</term>
+<listitem><para>
+This is not for normal use. Use the source to see for it might be used for.
+</para></listitem></varlistentry>
+
</variablelist>
</refsect1>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 08ef6b11d..87647369f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,25 @@
+Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * pkclist.c (build_pk_list): Fixed typo in format string.
+
+ * trustdb.c (create_shadow_dir): Don't translate the error string.
+
+ * g10.c (main): Fixed spelling of user-id.
+ * getkey.c (find_by_name_pk,find_by_name_sk,
+ find_by_keyid,find_by_keyid_sk): Ditto and translate it.
+ * import.c (mark_non_selfsigned_uids_valid,delete_inv_parts): Ditto.
+
+
+Mon Jul 26 01:01:39 CEST 1999 Michael Roth <mroth@nessie.de>
+
+ * g10.c, options.h: New options --no-literal and --set-filesize
+
+ * encode.c (encode_simple, encode_crypt): Support for the options
+ --no-literal and --set-filesize.
+
+ * sign.c (sign_file): ditto.
+
Fri Jul 23 13:53:03 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/g10/encode.c b/g10/encode.c
index 147607b31..5ee999665 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -70,7 +70,7 @@ encode_simple( const char *filename, int mode )
{
IOBUF inp, out;
PACKET pkt;
- PKT_plaintext *pt;
+ PKT_plaintext *pt = NULL;
STRING2KEY *s2k = NULL;
int rc = 0;
u32 filesize;
@@ -144,18 +144,22 @@ encode_simple( const char *filename, int mode )
m_free(enc);
}
- /* setup the inner packet */
- if( filename || opt.set_filename ) {
- char *s = make_basename( opt.set_filename ? opt.set_filename : filename );
- pt = m_alloc( sizeof *pt + strlen(s) - 1 );
- pt->namelen = strlen(s);
- memcpy(pt->name, s, pt->namelen );
- m_free(s);
- }
- else { /* no filename */
- pt = m_alloc( sizeof *pt - 1 );
- pt->namelen = 0;
+ if (!opt.no_literal) {
+ /* setup the inner packet */
+ if( filename || opt.set_filename ) {
+ char *s = make_basename( opt.set_filename ? opt.set_filename
+ : filename );
+ pt = m_alloc( sizeof *pt + strlen(s) - 1 );
+ pt->namelen = strlen(s);
+ memcpy(pt->name, s, pt->namelen );
+ m_free(s);
+ }
+ else { /* no filename */
+ pt = m_alloc( sizeof *pt - 1 );
+ pt->namelen = 0;
+ }
}
+
/* pgp5 has problems to decrypt symmetrically encrypted data from
* GnuPG if the filelength is in the inner packet. It works
* when only partial length headers are use. Until we have
@@ -167,14 +171,19 @@ encode_simple( const char *filename, int mode )
log_info(_("%s: WARNING: empty file\n"), filename );
}
else
- filesize = 0; /* stdin */
- pt->timestamp = make_timestamp();
- pt->mode = opt.textmode? 't' : 'b';
- pt->len = filesize;
- pt->buf = inp;
- pkt.pkttype = PKT_PLAINTEXT;
- pkt.pkt.plaintext = pt;
- cfx.datalen = filesize && !do_compress ? calc_packet_length( &pkt ) : 0;
+ filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */
+
+ if (!opt.no_literal) {
+ pt->timestamp = make_timestamp();
+ pt->mode = opt.textmode? 't' : 'b';
+ pt->len = filesize;
+ pt->buf = inp;
+ pkt.pkttype = PKT_PLAINTEXT;
+ pkt.pkt.plaintext = pt;
+ cfx.datalen = filesize && !do_compress ? calc_packet_length( &pkt ) : 0;
+ }
+ else
+ cfx.datalen = filesize && !do_compress ? filesize : 0;
/* register the cipher filter */
if( mode )
@@ -184,13 +193,32 @@ encode_simple( const char *filename, int mode )
iobuf_push_filter( out, compress_filter, &zfx );
/* do the work */
- if( (rc = build_packet( out, &pkt )) )
- log_error("build_packet failed: %s\n", g10_errstr(rc) );
+ if (!opt.no_literal) {
+ if( (rc = build_packet( out, &pkt )) )
+ log_error("build_packet failed: %s\n", g10_errstr(rc) );
+ }
+ else {
+ /* user requested not to create a literal packet,
+ * so we copy the plain data */
+ byte copy_buffer[4096];
+ int bytes_copied;
+ while ((bytes_copied = iobuf_read(inp, copy_buffer, 4096)) != -1)
+ if (iobuf_write(out, copy_buffer, bytes_copied) == -1) {
+ rc = G10ERR_WRITE_FILE;
+ log_error("copying input to output failed: %s\n", g10_errstr(rc) );
+ break;
+ }
+ memset(copy_buffer, 0, 4096); /* burn buffer */
+ }
/* finish the stuff */
iobuf_close(inp);
- iobuf_close(out); /* fixme: check returncode */
- pt->buf = NULL;
+ if (rc)
+ iobuf_cancel(out);
+ else
+ iobuf_close(out); /* fixme: check returncode */
+ if (pt)
+ pt->buf = NULL;
free_packet(&pkt);
m_free(cfx.dek);
m_free(s2k);
@@ -270,35 +298,43 @@ encode_crypt( const char *filename, STRLIST remusr )
if( rc )
goto leave;
- /* setup the inner packet */
- if( filename || opt.set_filename ) {
- char *s = make_basename( opt.set_filename ? opt.set_filename : filename );
- pt = m_alloc( sizeof *pt + strlen(s) - 1 );
- pt->namelen = strlen(s);
- memcpy(pt->name, s, pt->namelen );
- m_free(s);
- }
- else { /* no filename */
- pt = m_alloc( sizeof *pt - 1 );
- pt->namelen = 0;
- }
+ if (!opt.no_literal)
+ /* setup the inner packet */
+ if( filename || opt.set_filename ) {
+ char *s = make_basename( opt.set_filename ? opt.set_filename : filename );
+ pt = m_alloc( sizeof *pt + strlen(s) - 1 );
+ pt->namelen = strlen(s);
+ memcpy(pt->name, s, pt->namelen );
+ m_free(s);
+ }
+ else { /* no filename */
+ pt = m_alloc( sizeof *pt - 1 );
+ pt->namelen = 0;
+ }
+
if( filename && !opt.textmode ) {
if( !(filesize = iobuf_get_filelength(inp)) )
log_info(_("%s: WARNING: empty file\n"), filename );
}
else
- filesize = 0; /* stdin */
- pt->timestamp = make_timestamp();
- pt->mode = opt.textmode ? 't' : 'b';
- pt->len = filesize;
- pt->new_ctb = !pt->len && !opt.rfc1991;
- pt->buf = inp;
- pkt.pkttype = PKT_PLAINTEXT;
- pkt.pkt.plaintext = pt;
- cfx.datalen = filesize && !do_compress? calc_packet_length( &pkt ) : 0;
+ filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */
+
+ if (!opt.no_literal) {
+ pt->timestamp = make_timestamp();
+ pt->mode = opt.textmode ? 't' : 'b';
+ pt->len = filesize;
+ pt->new_ctb = !pt->len && !opt.rfc1991;
+ pt->buf = inp;
+ pkt.pkttype = PKT_PLAINTEXT;
+ pkt.pkt.plaintext = pt;
+ cfx.datalen = filesize && !do_compress? calc_packet_length( &pkt ) : 0;
+ }
+ else
+ cfx.datalen = filesize && !do_compress ? filesize : 0;
/* register the cipher filter */
iobuf_push_filter( out, cipher_filter, &cfx );
+
/* register the compress filter */
if( do_compress ) {
int compr_algo = select_algo_from_prefs( pk_list, PREFTYPE_COMPR );
@@ -312,8 +348,22 @@ encode_crypt( const char *filename, STRLIST remusr )
}
/* do the work */
- if( (rc = build_packet( out, &pkt )) )
- log_error("build_packet failed: %s\n", g10_errstr(rc) );
+ if (!opt.no_literal) {
+ if( (rc = build_packet( out, &pkt )) )
+ log_error("build_packet failed: %s\n", g10_errstr(rc) );
+ }
+ else {
+ /* user requested not to create a literal packet, so we copy the plain data */
+ byte copy_buffer[4096];
+ int bytes_copied;
+ while ((bytes_copied = iobuf_read(inp, copy_buffer, 4096)) != -1)
+ if (iobuf_write(out, copy_buffer, bytes_copied) == -1) {
+ rc = G10ERR_WRITE_FILE;
+ log_error("copying input to output failed: %s\n", g10_errstr(rc) );
+ break;
+ }
+ memset(copy_buffer, 0, 4096); /* burn buffer */
+ }
/* finish the stuff */
leave:
diff --git a/g10/g10.c b/g10/g10.c
index c169420b2..02d720290 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -175,6 +175,8 @@ enum cmd_and_opt_values { aNull = 0,
oDisableCipherAlgo,
oDisablePubkeyAlgo,
oAllowNonSelfsignedUID,
+ oNoLiteral,
+ oSetFilesize,
aTest };
@@ -334,6 +336,8 @@ static ARGPARSE_OPTS opts[] = {
{ oDisableCipherAlgo, "disable-cipher-algo", 2, "@" },
{ oDisablePubkeyAlgo, "disable-pubkey-algo", 2, "@" },
{ oAllowNonSelfsignedUID, "allow-non-selfsigned-uid", 0, "@" },
+ { oNoLiteral, "no-literal", 0, "@" },
+ { oSetFilesize, "set-filesize", 20, "@" },
{0} };
@@ -848,6 +852,12 @@ main( int argc, char **argv )
case oAllowNonSelfsignedUID:
opt.allow_non_selfsigned_uid = 1;
break;
+ case oNoLiteral:
+ opt.no_literal = 1;
+ break;
+ case oSetFilesize:
+ opt.set_filesize = pargs.r.ret_ulong;
+ break;
default : pargs.err = configfp? 1:2; break;
}
@@ -878,6 +888,17 @@ main( int argc, char **argv )
" the OpenPGP WG has not yet aggreed on MDCs\n");
opt.force_mdc = 0;
}
+ if (opt.no_literal) {
+ log_info(_("NOTE: %s is not for normal use!\n"), "--no-literal");
+ if (opt.textmode)
+ log_error(_("%s not allowed with %s!\n"),
+ "--textmode", "--no-literal" );
+ if (opt.set_filename)
+ log_error(_("%s makes no sense with %s!\n"),
+ "--set-filename", "--no-literal" );
+ }
+ if (opt.set_filesize)
+ log_info(_("NOTE: %s is not for normal use!\n"), "--set-filesize");
if( opt.batch )
tty_batchmode( 1 );
@@ -1158,7 +1179,7 @@ main( int argc, char **argv )
}
}
else
- wrong_args(_("-k[v][v][v][c] [userid] [keyring]") );
+ wrong_args(_("-k[v][v][v][c] [user-id] [keyring]") );
break;
case aKeygen: /* generate a key (interactive) */
diff --git a/g10/getkey.c b/g10/getkey.c
index a847d413f..4e325e0ac 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1286,9 +1286,9 @@ find_by_name( KBNODE keyblock, PKT_public_key *pk, const char *name,
return kk;
}
else if( is_RSA(pk->pubkey_algo) )
- log_error("RSA key cannot be used in this version\n");
+ log_error(_("RSA key cannot be used in this version\n"));
else
- log_error("No key for userid\n");
+ log_error(_("No key for user-id\n"));
}
}
return NULL;
@@ -1325,9 +1325,9 @@ find_by_name_sk( KBNODE keyblock, PKT_secret_key *sk, const char *name,
return kk;
}
else if( is_RSA(sk->pubkey_algo) )
- log_error("RSA key cannot be used in this version\n");
+ log_error(_("RSA key cannot be used in this version\n"));
else
- log_error("No key for userid\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 userid 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 userid for key\n");
+ log_error(_("No user-id for key\n"));
return k; /* found */
}
}
diff --git a/g10/import.c b/g10/import.c
index 023ce2964..9da71fbaf 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -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 userid '"),
+ 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 userid '"),
+ 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 );
diff --git a/g10/options.h b/g10/options.h
index 4278ff374..02613e3cc 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -81,6 +81,8 @@ struct {
const char *set_policy_url;
int use_embedded_filename;
int allow_non_selfsigned_uid;
+ int no_literal;
+ ulong set_filesize;
} opt;
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 6dff74219..310874421 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -765,7 +765,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
pk->pubkey_usage = use;
rc = get_pubkey_byname( NULL, pk, def_rec, NULL );
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)) ) {
PK_LIST r = m_alloc( sizeof *r );
r->pk = pk; pk = NULL;
diff --git a/g10/sign.c b/g10/sign.c
index 14c63f143..090c12b7a 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -385,17 +385,19 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
}
}
else {
- if( fname || opt.set_filename ) {
- char *s = make_basename( opt.set_filename ? opt.set_filename : fname );
- pt = m_alloc( sizeof *pt + strlen(s) - 1 );
- pt->namelen = strlen(s);
- memcpy(pt->name, s, pt->namelen );
- m_free(s);
- }
- else { /* no filename */
- pt = m_alloc( sizeof *pt - 1 );
- pt->namelen = 0;
- }
+ if (!opt.no_literal)
+ if( fname || opt.set_filename ) {
+ char *s = make_basename( opt.set_filename ? opt.set_filename : fname );
+ pt = m_alloc( sizeof *pt + strlen(s) - 1 );
+ pt->namelen = strlen(s);
+ memcpy(pt->name, s, pt->namelen );
+ m_free(s);
+ }
+ else { /* no filename */
+ pt = m_alloc( sizeof *pt - 1 );
+ pt->namelen = 0;
+ }
+
if( fname ) {
if( !(filesize = iobuf_get_filelength(inp)) )
log_info(_("WARNING: `%s' is an empty file\n"), fname );
@@ -409,20 +411,38 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
filesize = 0;
}
else
- filesize = 0; /* stdin */
- pt->timestamp = make_timestamp();
- pt->mode = opt.textmode && !outfile ? 't':'b';
- pt->len = filesize;
- pt->new_ctb = !pt->len && !opt.rfc1991;
- pt->buf = inp;
- pkt.pkttype = PKT_PLAINTEXT;
- pkt.pkt.plaintext = pt;
- /*cfx.datalen = filesize? calc_packet_length( &pkt ) : 0;*/
- if( (rc = build_packet( out, &pkt )) )
- log_error("build_packet(PLAINTEXT) failed: %s\n", g10_errstr(rc) );
- pt->buf = NULL;
+ filesize = opt.set_filesize ? opt.set_filesize : 0; /* stdin */
+
+ if (!opt.no_literal) {
+ pt->timestamp = make_timestamp();
+ pt->mode = opt.textmode && !outfile ? 't':'b';
+ pt->len = filesize;
+ pt->new_ctb = !pt->len && !opt.rfc1991;
+ pt->buf = inp;
+ pkt.pkttype = PKT_PLAINTEXT;
+ pkt.pkt.plaintext = pt;
+ /*cfx.datalen = filesize? calc_packet_length( &pkt ) : 0;*/
+ if( (rc = build_packet( out, &pkt )) )
+ log_error("build_packet(PLAINTEXT) failed: %s\n", g10_errstr(rc) );
+ pt->buf = NULL;
+ }
+ else {
+ byte copy_buffer[4096];
+ int bytes_copied;
+ while ((bytes_copied = iobuf_read(inp, copy_buffer, 4096)) != -1)
+ if (iobuf_write(out, copy_buffer, bytes_copied) == -1) {
+ rc = G10ERR_WRITE_FILE;
+ log_error("copying input to output failed: %s\n", g10_errstr(rc));
+ break;
+ }
+ memset(copy_buffer, 0, 4096); /* burn buffer */
+ }
}
+ /* catch errors from above blocks */
+ if (rc)
+ goto leave;
+
/* loop over the secret certificates */
for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
PKT_secret_key *sk;
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 7357b762a..0e60dfc25 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -799,7 +799,7 @@ create_shadow_dir( PKT_signature *sig )
/* first see whether we already have such a record */
rc = tdbio_search_sdir( sig->keyid, sig->pubkey_algo, &sdir );
if( rc && rc != -1 ) {
- log_error(_("tdbio_search_sdir failed: %s\n"), g10_errstr(rc));
+ log_error("tdbio_search_sdir failed: %s\n", g10_errstr(rc));
tdbio_invalid();
}
if( rc == -1 ) { /* not found: create */
diff --git a/po/ChangeLog b/po/ChangeLog
index 87309ed7b..9e7a36c0e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,9 @@
-Tue Jul 13 17:39:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+Mon Jul 26 09:34:46 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+ * it.po: Updated (Marco).
+
+Tue Jul 13 17:39:25 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* de.po: Updated (Walter)
diff --git a/po/de.po b/po/de.po
index 9adf94f9f..fc89a652f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
# Walter Koch <walterk@dip.de>, 1998.
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-07-23 12:13+0200\n"
+"POT-Creation-Date: 1999-07-23 14:25+0200\n"
"PO-Revision-Date: 1999-07-12 21:56+0200\n"
"Last-Translator: Walter Koch <walterk@mail.dip.de>\n"
"Language-Team: German <de@li.org>\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 46a101da0..a270a3696 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
# GPG version: 0.9.7
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-07-23 12:13+0200\n"
+"POT-Creation-Date: 1999-07-23 14:25+0200\n"
"PO-Revision-Date: 1999-06-06 18:33+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-13 10:49:25+0100\n"
diff --git a/po/fr.po b/po/fr.po
index aff1a51fd..ae9fb97de 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 0.9.7\n"
-"POT-Creation-Date: 1999-07-23 12:13+0200\n"
+"POT-Creation-Date: 1999-07-23 14:25+0200\n"
"PO-Revision-Date: 1999-05-24 21:48+02:00\n"
"Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
"Language-Team: French <traduc@Linux.EU.ORG>\n"
diff --git a/po/it.po b/po/it.po
index 66153ec3b..3b79d0114 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-07-23 12:13+0200\n"
-"PO-Revision-Date: 1999-06-28 19:49+02:00\n"
+"POT-Creation-Date: 1999-07-23 14:25+0200\n"
+"PO-Revision-Date: 1999-07-25 14:36+02:00\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
@@ -340,14 +340,12 @@ msgid "remove key from the public keyring"
msgstr "rimuove una chiave dal portachiavi pubblico"
#: g10/g10.c:201
-#, fuzzy
msgid "sign a key"
-msgstr "firma la chiave"
+msgstr "firma una chiave"
#: g10/g10.c:202
-#, fuzzy
msgid "sign a key locally"
-msgstr "firma la chiave localmente"
+msgstr "firma localmente una chiave"
#: g10/g10.c:203
msgid "sign or edit a key"
@@ -386,9 +384,8 @@ msgid "import ownertrust values"
msgstr "importa i valori di fiducia"
#: g10/g10.c:218
-#, fuzzy
msgid "update the trust database"
-msgstr "|[NOMI]|controlla il database della fiducia"
+msgstr "aggiorna il database della fiducia"
#: g10/g10.c:220
msgid "|[NAMES]|check the trust database"
@@ -429,13 +426,12 @@ msgid "|NAME|encrypt for NAME"
msgstr "|NOME|cifra per NOME"
#: g10/g10.c:234
-#, fuzzy
msgid "|NAME|use NAME as default recipient"
-msgstr "|NAME|usa NAME come chiave segreta predefinita"
+msgstr "|NOME|usa NOME come destinatario predefinito"
#: g10/g10.c:236
msgid "use the default key as default recipient"
-msgstr ""
+msgstr "usa la chiave predefinita come destinatario predefinito"
#: g10/g10.c:240
msgid "use this user-id to sign or decrypt"
@@ -443,7 +439,7 @@ msgstr "usa questo user-id per firmare o decifrare"
#: g10/g10.c:241
msgid "|N|set compress level N (0 disables)"
-msgstr "|N|imposta il livello di compressione (0 disabilita)"
+msgstr "|N|imposta il livello di compressione (0 disab.)"
#: g10/g10.c:243
msgid "use canonical text mode"
@@ -500,7 +496,7 @@ msgstr "aggiungi questo portachiavi segreto alla lista"
#: g10/g10.c:257
msgid "|NAME|use NAME as default secret key"
-msgstr "|NAME|usa NAME come chiave segreta predefinita"
+msgstr "|NOME|usa NOME come chiave segreta predefinita"
#: g10/g10.c:258
msgid "|HOST|use this keyserver to lookup keys"
@@ -508,7 +504,7 @@ msgstr "|HOST|cerca le chiavi in questo keyserver"
#: g10/g10.c:259
msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|imposta il set di caratteri del terminale NOME"
+msgstr "|NOME|imposta il set di caratteri del terminale NOME"
#: g10/g10.c:260
msgid "read options from file"
@@ -548,7 +544,7 @@ msgstr "emula il modo descritto in RFC 1991"
#: g10/g10.c:271
msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr "imposta per OpenPGP le opzioni di pacchetto, cifrario e digest"
+msgstr "imposta tutte le opzioni di pacchetto,\ncifrario e digest per OpenPGP"
#: g10/g10.c:272
msgid "|N|use passphrase mode N"
@@ -556,19 +552,19 @@ msgstr "|N|usa il modo N per la passphrase"
#: g10/g10.c:274
msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|NAME|usa l'algoritmo di message digest NOME"
+msgstr "|NOME|usa l'algoritmo di message digest NOME"
#: g10/g10.c:276
msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase"
+msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
#: g10/g10.c:277
msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|usa l'algoritmo di cifratura NOME"
+msgstr "|NOME|usa l'algoritmo di cifratura NOME"
#: g10/g10.c:278
msgid "|NAME|use message digest algorithm NAME"
-msgstr "|NAME|usa l'algoritmo di message digest NOME"
+msgstr "|NOME|usa l'algoritmo di message digest NOME"
#: g10/g10.c:279
msgid "|N|use compress algorithm N"
@@ -728,27 +724,23 @@ msgstr "--decrypt [nomefile]"
#: g10/g10.c:1091
msgid "--sign-key user-id"
-msgstr ""
+msgstr "--sign-key user-id"
#: g10/g10.c:1099
-#, fuzzy
msgid "--lsign-key user-id"
-msgstr "--delete-key nomeutente"
+msgstr "--lsign-key user-id"
#: g10/g10.c:1107
-#, fuzzy
msgid "--edit-key user-id [commands]"
-msgstr "--edit-key nomeutente [comandi]"
+msgstr "--edit-key user-id [comandi]"
#: g10/g10.c:1123
-#, fuzzy
msgid "--delete-secret-key user-id"
-msgstr "--delete-secret-key nomeutente"
+msgstr "--delete-secret-key user-id"
#: g10/g10.c:1126
-#, fuzzy
msgid "--delete-key user-id"
-msgstr "--delete-key nomeutente"
+msgstr "--delete-key user-id"
#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
#, c-format
@@ -888,9 +880,8 @@ msgstr ""
#. Translators: this shoud fit into 24 bytes to that the fingerprint
#. * data is properly aligned with the user ID
#: g10/pkclist.c:53
-#, fuzzy
msgid " Fingerprint:"
-msgstr "importate: %lu"
+msgstr " Fingerprint:"
# valid user replies (not including 1..4)
# [Marco, you can change 'm' and 's' to whatever letters you like]
@@ -1111,13 +1102,12 @@ msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
#: g10/pkclist.c:739
-#, fuzzy
msgid "Public key is disabled.\n"
-msgstr "la chiave pubblica è %08lX\n"
+msgstr "La chiave pubblica è disabilitata.\n"
#: g10/pkclist.c:768
msgid "unknown default recipient `s'\n"
-msgstr ""
+msgstr "destinatario predefinito sconosciuto `s'\n"
#: g10/pkclist.c:801
#, c-format
@@ -1125,9 +1115,9 @@ msgid "%s: error checking key: %s\n"
msgstr "%s: errore nel controllare la chiave: %s\n"
#: g10/pkclist.c:806
-#, fuzzy, c-format
+#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: saltato: chiave pubblica già presente\n"
+msgstr "%s: saltato: chiave pubblica disabilitata\n"
#: g10/pkclist.c:844
msgid "no valid addressees\n"
@@ -1744,9 +1734,9 @@ msgid "key %08lX: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
#: g10/import.c:769
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: accepted non self-signed userid '"
-msgstr "chiave %08lX: saltato l'user id '"
+msgstr "chiave %08lX: accettato l'userid non autofirmato '"
#: g10/import.c:798
#, c-format
@@ -2113,21 +2103,19 @@ msgstr "revoca una chiave secondaria"
#: g10/keyedit.c:594
msgid "disable"
-msgstr ""
+msgstr "disable"
#: g10/keyedit.c:594
-#, fuzzy
msgid "disable a key"
-msgstr "chiave sbagliata"
+msgstr "disabilita una chiave"
#: g10/keyedit.c:595
msgid "enable"
-msgstr ""
+msgstr "abilita"
#: g10/keyedit.c:595
-#, fuzzy
msgid "enable a key"
-msgstr "chiave sbagliata"
+msgstr "abilita una chiave"
#: g10/keyedit.c:614
msgid "can't do that in batchmode\n"
@@ -2223,9 +2211,8 @@ msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
#: g10/keyedit.c:1065
-#, fuzzy
msgid "This key has been disabled"
-msgstr "Nota: questa chiave è scaduta!\n"
+msgstr "Questa chiave è stata disabilitata"
#: g10/keyedit.c:1336
msgid "Delete this good signature? (y/N/q)"
@@ -2327,19 +2314,18 @@ msgid "public key encrypted data: good DEK\n"
msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
#: g10/mainproc.c:275
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
+msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
#: g10/mainproc.c:285
-#, fuzzy, c-format
+#, c-format
msgid "encrypted with %s key, ID %08lX\n"
-msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
+msgstr "Firma fatta con la chiave %s con ID %08lX\n"
#: g10/mainproc.c:291
-#, fuzzy
msgid "no secret key for decryption available\n"
-msgstr "la chiave segreta non è disponibile"
+msgstr "nessuna chiave disponibile per decifrare\n"
#: g10/mainproc.c:300
#, c-format
@@ -2472,9 +2458,8 @@ msgid " (main key ID %08lX)"
msgstr " (key ID principale %08lX)"
#: g10/passphrase.c:190
-#, fuzzy
msgid "can't query password in batchmode\n"
-msgstr "impossibile fare questo in batch mode\n"
+msgstr "impossibile chiedere la password in batch mode\n"
#: g10/passphrase.c:194
msgid "Enter passphrase: "
@@ -2817,9 +2802,9 @@ msgid "enumerate secret keys failed: %s\n"
msgstr "enumerate secret keys fallito: %s\n"
#: g10/trustdb.c:802
-#, fuzzy, c-format
+#, c-format
msgid "tdbio_search_sdir failed: %s\n"
-msgstr "tdbio_search_dir fallita: %s\n"
+msgstr "tdbio_search_sdir fallita: %s\n"
#: g10/trustdb.c:877
#, c-format
@@ -2855,15 +2840,12 @@ msgid "Invalid self-signature"
msgstr "Autofirma non valida"
#: g10/trustdb.c:1060
-#, fuzzy
msgid "Valid user ID revocation skipped due to a newer self signature"
-msgstr ""
-"Evitata la revoca dell'user ID valida a causa di una autofirma più recente\n"
+msgstr "Saltata una revoca dell'user ID valida a causa di una autofirma più recente"
#: g10/trustdb.c:1066
-#, fuzzy
msgid "Valid user ID revocation"
-msgstr "Revoca dell'user ID valida\n"
+msgstr "Revoca dell'user ID valida"
#: g10/trustdb.c:1071
msgid "Invalid user ID revocation"
@@ -2915,9 +2897,9 @@ msgid "lid %lu: inserted\n"
msgstr "lid %lu: inserito\n"
#: g10/trustdb.c:1652
-#, fuzzy, c-format
+#, c-format
msgid "error reading dir record: %s\n"
-msgstr "%s: errore durante la lettura del record libero: %s\n"
+msgstr "errore durante la lettura del dir record: %s\n"
#: g10/trustdb.c:1660 g10/trustdb.c:1714
#, c-format
@@ -3082,9 +3064,8 @@ msgid "%s: unknown suffix\n"
msgstr "%s: suffisso sconosciuto\n"
#: g10/openfile.c:119
-#, fuzzy
msgid "Enter new filename"
-msgstr "--store [nomefile]"
+msgstr "Inserire il nome del nuovo file"
#: g10/openfile.c:160
msgid "writing to stdout\n"
@@ -3257,7 +3238,7 @@ msgstr "openfile.overwrite.okay"
#. openfile.c (ask_outfile_name)
#: g10/helptext.c:220
msgid "openfile.askoutname"
-msgstr ""
+msgstr "openfile.askoutname"
#: g10/helptext.c:235
msgid "No help available"
@@ -3267,83 +3248,3 @@ msgstr "Non è disponibile un aiuto"
#, c-format
msgid "No help available for `%s'"
msgstr "Non è disponibile un aiuto per `%s'"
-
-#~ msgid "print all message digests"
-#~ msgstr "stampa tutti i message digests"
-
-#~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
-#~ msgstr ""
-#~ "NOTA: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n"
-
-#~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
-#~ msgstr "NOTA: rec di %lu[%d] nella hintlist di %lu ma non marcato\n"
-
-#~ msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
-#~ msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n"
-
-#~ msgid "lid %lu: no primary key\n"
-#~ msgstr "lid %lu: manca la chiave primaria\n"
-
-#~ msgid "lid %lu: user id not found in keyblock\n"
-#~ msgstr "lid %lu: user id non trovato nel keyblock\n"
-
-#~ msgid "lid %lu: user id without signature\n"
-#~ msgstr "chiave %08lX: user id senza firma\n"
-
-#~ msgid "lid %lu: self-signature in hintlist\n"
-#~ msgstr "lid %lu: autofirma nella hintlist\n"
-
-#~ msgid "very strange: no public key\n"
-#~ msgstr "molto strano: non ci sono chiavi pubbliche\n"
-
-#~ msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
-#~ msgstr "hintlist %lu[%d] di %lu non punta a un record dir\n"
-
-#~ msgid "lid %lu does not have a key\n"
-#~ msgstr "Il lid %lu non ha una chiave\n"
-
-#~ msgid "lid %lu: can't get keyblock: %s\n"
-#~ msgstr "lid %lu: impossibile ottenere il keyblock: %s\n"
-
-#~ msgid "Too many preferences"
-#~ msgstr "Troppe preferenze"
-
-#~ msgid "Too many preference items"
-#~ msgstr "Troppi elementi di preferenza"
-
-#~ msgid "public key not anymore available"
-#~ msgstr "chiave pubblica non più disponibile"
-
-#~ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
-#~ msgstr ""
-#~ "uid %08lX.%lu/%02X%02X: ha shadow dir %lu ma non è ancora marcato.\n"
-
-#~ msgid "insert_trust_record: keyblock not found: %s\n"
-#~ msgstr "insert_trust_record: keyblock non trovato: %s\n"
-
-#~ msgid "lid %lu: update failed: %s\n"
-#~ msgstr "lid %lu: aggiornamento fallito: %s\n"
-
-#~ msgid "lid %lu: updated\n"
-#~ msgstr "lid %lu: aggiornato\n"
-
-#~ msgid "lid %lu: okay\n"
-#~ msgstr "lid %lu: corretto\n"
-
-#~ msgid "%s: keyblock read problem: %s\n"
-#~ msgstr "%s: il keyblock ha problemi di lettura: %s\n"
-
-#~ msgid "%s: update failed: %s\n"
-#~ msgstr "%s: aggiornamento fallito: %s\n"
-
-#~ msgid "%s: updated\n"
-#~ msgstr "%s: aggiornato\n"
-
-#~ msgid "%s: okay\n"
-#~ msgstr "%s: va bene\n"
-
-#~ msgid "lid %lu: keyblock not found: %s\n"
-#~ msgstr "lid %lu: keyblock non trovato: %s\n"
-
-#~ msgid "keyedit.cmd"
-#~ msgstr "keyedit.cmd"
diff --git a/po/pl.po b/po/pl.po
index e27477902..f6d64ad8f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-07-23 12:13+0200\n"
+"POT-Creation-Date: 1999-07-23 14:25+0200\n"
"PO-Revision-Date: 1999-05-30 19:08+02:00\n"
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2be312fd2..ed98b6278 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-07-23 12:13+0200\n"
+"POT-Creation-Date: 1999-07-23 14:25+0200\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Date: 1998-11-20 23:46:36-0200\n"
"From: Thiago Jung Bauermann <jungmann@usa.net>\n"
diff --git a/po/ru.po b/po/ru.po
index a7a57b942..2f4940165 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
# QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
msgid ""
msgstr ""
-"POT-Creation-Date: 1999-07-23 12:13+0200\n"
+"POT-Creation-Date: 1999-07-23 14:25+0200\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-01-26 22:08:36+0100\n"
"From: Gregory Steuck <steuck@iname.com>\n"