mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
See ChangeLog: Mon May 31 19:41:10 CEST 1999 Werner Koch
This commit is contained in:
Werner Koch
parent
a6a548ab56
commit
c34c676958
9
AUTHORS
9
AUTHORS
@ -29,6 +29,12 @@ nh@df.lth.se
|
||||
Weak key patches.
|
||||
|
||||
|
||||
GNUPG Rémi Guyomarch ????????????
|
||||
Assigns changes.
|
||||
rguyom@mail.dotcom.fr
|
||||
Various speed up patches.
|
||||
|
||||
|
||||
TRANSLATIONS Marco d'Itri 1997-02-22
|
||||
Disclaimer. [it]
|
||||
md@linux.it
|
||||
@ -61,10 +67,11 @@ jungmann@cwb.matrix.com.br
|
||||
|
||||
TRANSLATIONS Janusz Aleksander Urbanowicz 1999-01-09
|
||||
pl.po
|
||||
alex@bofh.torun.pl
|
||||
|
||||
|
||||
|
||||
Other notes:
|
||||
More credits
|
||||
============
|
||||
This program uses the zlib compression library written by
|
||||
Jean-loup Gailly and Mark Adler.
|
||||
|
||||
6
BUGS
6
BUGS
@ -42,6 +42,10 @@ and after about half a day in the rsync snapshots.
|
||||
--> Solaris fixed.
|
||||
--> IRIX bug still there
|
||||
|
||||
[ *] #18 1999-05-27 <Steffen.Zahn@icn.siemens.de> 0.9.7
|
||||
rndunix hangs on hp/ux. The problme is related to my_plcose which is
|
||||
not always called. (I suggest to use EGD instead of rndunix.)
|
||||
|
||||
Next #18
|
||||
|
||||
Next #19
|
||||
|
||||
|
||||
2
TODO
2
TODO
@ -1,4 +1,6 @@
|
||||
|
||||
* add keylength and type to status output.
|
||||
|
||||
* add some status output put for signing and encryption.
|
||||
replace the putc in primegen with some kind of status-fd outputs.
|
||||
|
||||
|
||||
14
doc/gpg.1pod
14
doc/gpg.1pod
@ -461,12 +461,6 @@ B<--compress-algo> I<number>
|
||||
i.e. the compression algorithm is selected from the
|
||||
preferences.
|
||||
|
||||
B<--digest-algo> I<name>
|
||||
Use I<name> as message digest algorithm. Running the
|
||||
program with the command B<--version> yields a list of
|
||||
supported algorithms.
|
||||
|
||||
|
||||
B<--throw-keyid>
|
||||
Do not put the keyid into encrypted packets. This option
|
||||
hides the receiver of the message and is a countermeasure
|
||||
@ -600,7 +594,9 @@ is B<very> easy to spy out your passphrase!
|
||||
=head1 BUGS
|
||||
|
||||
On many systems this program should be installed as setuid(root). This
|
||||
is necessary to lock memory pages. If you get no warning message about
|
||||
insecure memory your OS kernel supports locking without being root.
|
||||
The program drops root privileges as soon as locked memory is allocated.
|
||||
is necessary to lock memory pages. Locking memory pages prevents the
|
||||
operating system from writing memory pages to disk. If you get no
|
||||
warning message about insecure memory your operating system supports
|
||||
locking without being root. The program drops root privileges as soon
|
||||
as locked memory is allocated.
|
||||
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
Mon May 31 19:41:10 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* g10.c (main): Fix for SHM init (Michael).
|
||||
|
||||
* compress.c, encr-data.c, mdfilter.c,
|
||||
plaintext.c, free-packet.c: Speed patches (Rémi).
|
||||
|
||||
Thu May 27 09:40:55 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* status.c (cpr_get_answer_yes_no_quit): New.
|
||||
|
||||
@ -566,7 +566,6 @@ find_subpkt( byte *buffer, sigsubpkttype_t reqtype,
|
||||
return NULL;
|
||||
buflen = (*buffer << 8) | buffer[1];
|
||||
buffer += 2;
|
||||
log_debug("find_subpkt: tyoe=%d bufferlength=%d\n", reqtype, buflen );
|
||||
for(;;) {
|
||||
if( !buflen )
|
||||
return NULL; /* end of packets; not found */
|
||||
@ -587,7 +586,6 @@ find_subpkt( byte *buffer, sigsubpkttype_t reqtype,
|
||||
buffer++;
|
||||
buflen--;
|
||||
}
|
||||
log_debug("find_subpkt: this len=%u\n", n );
|
||||
if( buflen < n )
|
||||
break;
|
||||
type = *buffer & 0x7f;
|
||||
|
||||
@ -132,8 +132,7 @@ do_uncompress( compress_filter_context_t *zfx, z_stream *zs,
|
||||
int zrc;
|
||||
int rc=0;
|
||||
size_t n;
|
||||
byte *p;
|
||||
int c;
|
||||
int nread, count;
|
||||
int refill = !zs->avail_in;
|
||||
|
||||
if( DBG_FILTER )
|
||||
@ -145,16 +144,17 @@ do_uncompress( compress_filter_context_t *zfx, z_stream *zs,
|
||||
n = zs->avail_in;
|
||||
if( !n )
|
||||
zs->next_in = zfx->inbuf;
|
||||
for( p=zfx->inbuf+n; n < zfx->inbufsize; n++, p++ ) {
|
||||
if( (c=iobuf_get(a)) == -1 ) {
|
||||
/* If we use the undocumented feature to suppress
|
||||
* the zlib header, we have to give inflate an
|
||||
* extra dummy byte to read */
|
||||
if( zfx->algo != 1 || zfx->algo1hack )
|
||||
break;
|
||||
zfx->algo1hack = 1;
|
||||
}
|
||||
*p = c & 0xff;
|
||||
count = zfx->inbufsize - n;
|
||||
nread = iobuf_read( a, zfx->inbuf + n, count );
|
||||
if( nread == -1 ) nread = 0;
|
||||
n += nread;
|
||||
/* If we use the undocumented feature to suppress
|
||||
* the zlib header, we have to give inflate an
|
||||
* extra dummy byte to read */
|
||||
if( nread < count && zfx->algo == 1 ) {
|
||||
*(zfx->inbuf + n) = 0xFF; /* is it really needed ? */
|
||||
zfx->algo1hack = 1;
|
||||
n++;
|
||||
}
|
||||
zs->avail_in = n;
|
||||
}
|
||||
|
||||
@ -217,16 +217,11 @@ decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
|
||||
decode_filter_ctx_t *fc = opaque;
|
||||
size_t n, size = *ret_len;
|
||||
int rc = 0;
|
||||
int c;
|
||||
|
||||
if( control == IOBUFCTRL_UNDERFLOW ) {
|
||||
assert(a);
|
||||
for(n=0; n < size; n++ ) {
|
||||
if( (c = iobuf_get(a)) == -1 )
|
||||
break;
|
||||
buf[n] = c;
|
||||
}
|
||||
|
||||
n = iobuf_read( a, buf, size );
|
||||
if( n == -1 ) n = 0;
|
||||
if( n )
|
||||
cipher_decrypt( fc->cipher_hd, buf, buf, n);
|
||||
else
|
||||
|
||||
@ -229,7 +229,7 @@ free_compressed( PKT_compressed *zd )
|
||||
if( zd->buf ) { /* have to skip some bytes */
|
||||
/* don't have any information about the length, so
|
||||
* we assume this is the last packet */
|
||||
while( iobuf_get(zd->buf) != -1 )
|
||||
while( iobuf_read( zd->buf, NULL, 1<<30 ) != -1 )
|
||||
;
|
||||
}
|
||||
m_free(zd);
|
||||
@ -240,12 +240,12 @@ free_encrypted( PKT_encrypted *ed )
|
||||
{
|
||||
if( ed->buf ) { /* have to skip some bytes */
|
||||
if( iobuf_in_block_mode(ed->buf) ) {
|
||||
while( iobuf_get(ed->buf) != -1 )
|
||||
while( iobuf_read( ed->buf, NULL, 1<<30 ) != -1 )
|
||||
;
|
||||
}
|
||||
else {
|
||||
for( ; ed->len; ed->len-- ) /* skip the packet */
|
||||
iobuf_get(ed->buf);
|
||||
while( ed->len ) /* skip the packet */
|
||||
ed->len -= iobuf_read( ed->buf, NULL, ed->len );
|
||||
}
|
||||
}
|
||||
m_free(ed);
|
||||
@ -257,12 +257,12 @@ free_plaintext( PKT_plaintext *pt )
|
||||
{
|
||||
if( pt->buf ) { /* have to skip some bytes */
|
||||
if( iobuf_in_block_mode(pt->buf) ) {
|
||||
while( iobuf_get(pt->buf) != -1 )
|
||||
while( iobuf_read( pt->buf, NULL, 1<<30 ) != -1 )
|
||||
;
|
||||
}
|
||||
else {
|
||||
for( ; pt->len; pt->len-- ) /* skip the packet */
|
||||
iobuf_get(pt->buf);
|
||||
while( pt->len ) /* skip the packet */
|
||||
pt->len -= iobuf_read( pt->buf, NULL, pt->len );
|
||||
}
|
||||
}
|
||||
m_free(pt);
|
||||
|
||||
@ -554,6 +554,11 @@ main( int argc, char **argv )
|
||||
opt.shm_coprocess = 1;
|
||||
requested_shm_size = pargs.r.ret_ulong;
|
||||
}
|
||||
else if ( pargs.r_opt == oStatusFD ) {
|
||||
/* this is needed to ensure that the status-fd filedescriptor is
|
||||
* initialized when init_shm_coprocessing() is called */
|
||||
set_status_fd( pargs.r.ret_int );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -42,17 +42,13 @@ md_filter( void *opaque, int control,
|
||||
{
|
||||
size_t size = *ret_len;
|
||||
md_filter_context_t *mfx = opaque;
|
||||
int i, c, rc=0;
|
||||
int i, rc=0;
|
||||
|
||||
if( control == IOBUFCTRL_UNDERFLOW ) {
|
||||
if( mfx->maxbuf_size && size > mfx->maxbuf_size )
|
||||
size = mfx->maxbuf_size;
|
||||
for(i=0; i < size; i++ ) {
|
||||
if( (c = iobuf_get(a)) == -1 )
|
||||
break;
|
||||
buf[i] = c;
|
||||
}
|
||||
|
||||
i = iobuf_read( a, buf, size );
|
||||
if( i == -1 ) i = 0;
|
||||
if( i ) {
|
||||
md_write(mfx->md, buf, i );
|
||||
if( mfx->md2 )
|
||||
|
||||
107
g10/plaintext.c
107
g10/plaintext.c
@ -90,41 +90,92 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
|
||||
|
||||
if( pt->len ) {
|
||||
assert( !clearsig );
|
||||
for( ; pt->len; pt->len-- ) {
|
||||
if( (c = iobuf_get(pt->buf)) == -1 ) {
|
||||
log_error("Problem reading source (%u bytes remaining)\n",
|
||||
(unsigned)pt->len);
|
||||
rc = G10ERR_READ_FILE;
|
||||
goto leave;
|
||||
}
|
||||
if( mfx->md )
|
||||
md_putc(mfx->md, c );
|
||||
if( convert && c == '\r' )
|
||||
continue; /* fixme: this hack might be too simple */
|
||||
if( fp ) {
|
||||
if( putc( c, fp ) == EOF ) {
|
||||
log_error("Error writing to `%s': %s\n",
|
||||
fname, strerror(errno) );
|
||||
rc = G10ERR_WRITE_FILE;
|
||||
if( convert ) { // text mode
|
||||
for( ; pt->len; pt->len-- ) {
|
||||
if( (c = iobuf_get(pt->buf)) == -1 ) {
|
||||
log_error("Problem reading source (%u bytes remaining)\n",
|
||||
(unsigned)pt->len);
|
||||
rc = G10ERR_READ_FILE;
|
||||
goto leave;
|
||||
}
|
||||
if( mfx->md )
|
||||
md_putc(mfx->md, c );
|
||||
if( c == '\r' )
|
||||
continue; /* fixme: this hack might be too simple */
|
||||
if( fp ) {
|
||||
if( putc( c, fp ) == EOF ) {
|
||||
log_error("Error writing to `%s': %s\n",
|
||||
fname, strerror(errno) );
|
||||
rc = G10ERR_WRITE_FILE;
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if( !clearsig ) {
|
||||
while( (c = iobuf_get(pt->buf)) != -1 ) {
|
||||
if( mfx->md )
|
||||
md_putc(mfx->md, c );
|
||||
if( convert && c == '\r' )
|
||||
continue; /* fixme: this hack might be too simple */
|
||||
if( fp ) {
|
||||
if( putc( c, fp ) == EOF ) {
|
||||
log_error("Error writing to `%s': %s\n",
|
||||
fname, strerror(errno) );
|
||||
rc = G10ERR_WRITE_FILE;
|
||||
else { // binary mode
|
||||
byte *buffer = m_alloc( 32768 );
|
||||
while( pt->len ) {
|
||||
int len = pt->len > 32768 ? 32768 : pt->len;
|
||||
len = iobuf_read( pt->buf, buffer, len );
|
||||
if( len == -1 ) {
|
||||
log_error("Problem reading source (%u bytes remaining)\n",
|
||||
(unsigned)pt->len);
|
||||
rc = G10ERR_READ_FILE;
|
||||
m_free( buffer );
|
||||
goto leave;
|
||||
}
|
||||
if( mfx->md )
|
||||
md_write( mfx->md, buffer, len );
|
||||
if( fp ) {
|
||||
if( fwrite( buffer, 1, len, fp ) != len ) {
|
||||
log_error("Error writing to `%s': %s\n",
|
||||
fname, strerror(errno) );
|
||||
rc = G10ERR_WRITE_FILE;
|
||||
m_free( buffer );
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
pt->len -= len;
|
||||
}
|
||||
m_free( buffer );
|
||||
}
|
||||
}
|
||||
else if( !clearsig ) {
|
||||
if( convert ) { // text mode
|
||||
while( (c = iobuf_get(pt->buf)) != -1 ) {
|
||||
if( mfx->md )
|
||||
md_putc(mfx->md, c );
|
||||
if( convert && c == '\r' )
|
||||
continue; /* fixme: this hack might be too simple */
|
||||
if( fp ) {
|
||||
if( putc( c, fp ) == EOF ) {
|
||||
log_error("Error writing to `%s': %s\n",
|
||||
fname, strerror(errno) );
|
||||
rc = G10ERR_WRITE_FILE;
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else { // binary mode
|
||||
byte *buffer = m_alloc( 32768 );
|
||||
for( ;; ) {
|
||||
int len = iobuf_read( pt->buf, buffer, 32768 );
|
||||
if( len == -1 )
|
||||
break;
|
||||
if( mfx->md )
|
||||
md_write( mfx->md, buffer, len );
|
||||
if( fp ) {
|
||||
if( fwrite( buffer, 1, len, fp ) != len ) {
|
||||
log_error("Error writing to `%s': %s\n",
|
||||
fname, strerror(errno) );
|
||||
rc = G10ERR_WRITE_FILE;
|
||||
m_free( buffer );
|
||||
goto leave;
|
||||
}
|
||||
}
|
||||
}
|
||||
m_free( buffer );
|
||||
}
|
||||
pt->buf = NULL;
|
||||
}
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Mon May 31 19:41:10 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* de.po: New version (Walter).
|
||||
|
||||
* pl.po: New version (Alex).
|
||||
|
||||
Tue May 25 19:50:32 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* fr.po: Imported new version.
|
||||
|
||||
214
po/pl.po
214
po/pl.po
@ -5,22 +5,16 @@
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-0.9.2\n"
|
||||
"Project-Id-Version: gnupg-0.9.7\n"
|
||||
"POT-Creation-Date: 1999-05-23 15:36+0200\n"
|
||||
"PO-Revision-Date: 1999-01-26 01:30+01:00\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"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=ISO-8859-2\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments "
|
||||
"--keywor\\d=_ --keyword=N_ --files-from=./POTFILES.in\n"
|
||||
"Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c "
|
||||
"cipher\\/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c "
|
||||
"g10/decrypt\\.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c "
|
||||
"g10/mainproc.c g10/pas\\sphrase.c g10/plaintext.c g10/pref.c "
|
||||
"g10/seckey-cert.c g10/sig-check.c g10/sign\\.c g10/trustdb.c g10/verify.c "
|
||||
"g10/status.c g10/pubkey-enc.c\n"
|
||||
"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --keywor\\d=_ --keyword=N_ --files-from=./POTFILES.in\n"
|
||||
"Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c cipher\\/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c g10/decrypt\\.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/mainproc.c g10/pas\\sphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/sig-check.c g10/sign\\.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-enc.c\n"
|
||||
|
||||
#: util/secmem.c:76
|
||||
msgid "Warning: using insecure memory!\n"
|
||||
@ -28,11 +22,11 @@ msgstr "Ostrze
|
||||
|
||||
#: util/secmem.c:249
|
||||
msgid "operation is not possible without initialized secure memory\n"
|
||||
msgstr ""
|
||||
msgstr "operacja niemożliwa do wykonania bez dostępnej pamięci bezpiecznej\n"
|
||||
|
||||
#: util/secmem.c:250
|
||||
msgid "(you may have used the wrong program for this task)\n"
|
||||
msgstr ""
|
||||
msgstr "(prawdopodobnie używany program jest niewłaściwy dlatego zadania)\n"
|
||||
|
||||
#: util/miscutil.c:156
|
||||
msgid "yes"
|
||||
@ -152,7 +146,7 @@ msgstr "algorytm szyfrowania z kluczem publicznym nie jest zaimplementowany"
|
||||
|
||||
#: util/errors.c:81
|
||||
msgid "unimplemented cipher algorithm"
|
||||
msgstr "algorytm szyfrujący nie jest zaimplementowany."
|
||||
msgstr "algorytm szyfrujący nie jest zaimplementowany"
|
||||
|
||||
#: util/errors.c:82
|
||||
msgid "unknown signature class"
|
||||
@ -224,16 +218,15 @@ msgstr "niepoprawny URI"
|
||||
|
||||
#: util/errors.c:99
|
||||
msgid "unsupported URI"
|
||||
msgstr "URI nie obsługiwanego typu"
|
||||
msgstr "URI typu nie obsługiwanego"
|
||||
|
||||
#: util/errors.c:100
|
||||
msgid "network error"
|
||||
msgstr "b³±d sieci"
|
||||
|
||||
#: util/errors.c:102
|
||||
#, fuzzy
|
||||
msgid "not encrypted"
|
||||
msgstr "%s zaszyfrowane dane\n"
|
||||
msgstr "nie zaszyfrowany"
|
||||
|
||||
#: util/logger.c:218
|
||||
#, c-format
|
||||
@ -362,13 +355,12 @@ msgid "export keys to a key server"
|
||||
msgstr "eksport kluczy do serwera kluczy"
|
||||
|
||||
#: g10/g10.c:187
|
||||
#, fuzzy
|
||||
msgid "import keys from a key server"
|
||||
msgstr "eksport kluczy do serwera kluczy"
|
||||
msgstr "import kluczy z serwera kluczy"
|
||||
|
||||
#: g10/g10.c:190
|
||||
msgid "import/merge keys"
|
||||
msgstr "dołączanie klucza do zbioru"
|
||||
msgstr "import/dołączenie kluczy"
|
||||
|
||||
#: g10/g10.c:192
|
||||
msgid "list only the sequence of packets"
|
||||
@ -396,11 +388,11 @@ msgstr "naprawa uszkodzonej Bazy Zaufania"
|
||||
|
||||
#: g10/g10.c:202
|
||||
msgid "De-Armor a file or stdin"
|
||||
msgstr "Zdjęcie opakowania ASCII pliku lub potoku"
|
||||
msgstr "zdjęcie opakowania ASCII pliku lub potoku"
|
||||
|
||||
#: g10/g10.c:203
|
||||
msgid "En-Armor a file or stdin"
|
||||
msgstr "Opakowanie ASCII pliku lub potoku"
|
||||
msgstr "opakowanie ASCII pliku lub potoku"
|
||||
|
||||
#: g10/g10.c:204
|
||||
msgid "|algo [files]|print message digests"
|
||||
@ -425,9 +417,8 @@ msgid "create ascii armored output"
|
||||
msgstr "plik wynikowy w opakowaniu ASCII"
|
||||
|
||||
#: g10/g10.c:214
|
||||
#, fuzzy
|
||||
msgid "|NAME|encrypt for NAME"
|
||||
msgstr "|NAZWA|zestaw znaków terminala NAZWA"
|
||||
msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
|
||||
|
||||
#: g10/g10.c:218
|
||||
msgid "use this user-id to sign or decrypt"
|
||||
@ -458,13 +449,12 @@ msgid "force v3 signatures"
|
||||
msgstr "wymuszenie trzeciej wersji formatu podpisów"
|
||||
|
||||
#: g10/g10.c:226
|
||||
#, fuzzy
|
||||
msgid "always use a MDC for encryption"
|
||||
msgstr "użyć tego identyfikatora do szyfrowania"
|
||||
msgstr "do szyfrowania będzie używany MDC"
|
||||
|
||||
#: g10/g10.c:227
|
||||
msgid "do not make any changes"
|
||||
msgstr ""
|
||||
msgstr "pozostawienie bez zmian"
|
||||
|
||||
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
|
||||
#: g10/g10.c:229
|
||||
@ -481,7 +471,7 @@ msgstr "automatyczna odpowied
|
||||
|
||||
#: g10/g10.c:232
|
||||
msgid "add this keyring to the list of keyrings"
|
||||
msgstr "dodać zbiór kluczy do listy"
|
||||
msgstr "dodać zbiór kluczy do listy używanych"
|
||||
|
||||
#: g10/g10.c:233
|
||||
msgid "add this secret keyring to the list"
|
||||
@ -561,7 +551,7 @@ msgstr "|N|algorytm kompresji N"
|
||||
|
||||
#: g10/g10.c:256
|
||||
msgid "throw keyid field of encrypted packets"
|
||||
msgstr "usunięcie identyfikatorów kluczy pakietów"
|
||||
msgstr "usunięcie identyfikatorów kluczy z pakietów"
|
||||
|
||||
#: g10/g10.c:258
|
||||
msgid ""
|
||||
@ -590,7 +580,7 @@ msgstr "B
|
||||
|
||||
#: g10/g10.c:331
|
||||
msgid "Usage: gpg [options] [files] (-h for help)"
|
||||
msgstr "Sposób użycia: gpg [opcje] [pliki] (-h podaje pomoc)"
|
||||
msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
|
||||
|
||||
#: g10/g10.c:334
|
||||
msgid ""
|
||||
@ -612,7 +602,7 @@ msgstr ""
|
||||
|
||||
#: g10/g10.c:413
|
||||
msgid "usage: gpg [options] "
|
||||
msgstr "sposób użycia: gpg [opcje]"
|
||||
msgstr "wywołanie: gpg [opcje]"
|
||||
|
||||
#: g10/g10.c:453
|
||||
msgid "conflicting commands\n"
|
||||
@ -728,12 +718,12 @@ msgstr "-k[v][v][v][c] [identyfikator] [zbi
|
||||
#: g10/g10.c:1083
|
||||
#, c-format
|
||||
msgid "dearmoring failed: %s\n"
|
||||
msgstr "Usunięcie opakowania ASCII nie powiodło się: %s\n"
|
||||
msgstr "usunięcie opakowania ASCII nie powiodło się: %s\n"
|
||||
|
||||
#: g10/g10.c:1091
|
||||
#, c-format
|
||||
msgid "enarmoring failed: %s\n"
|
||||
msgstr "Opakowywanie ASCII nie powiodło się: %s\n"
|
||||
msgstr "opakowywanie ASCII nie powiodło się: %s\n"
|
||||
|
||||
#: g10/g10.c:1157
|
||||
#, c-format
|
||||
@ -760,7 +750,7 @@ msgstr "opakowanie: %s\n"
|
||||
|
||||
#: g10/armor.c:319
|
||||
msgid "invalid armor header: "
|
||||
msgstr "Niepoprawny nagłówek opakowania: "
|
||||
msgstr "niepoprawny nagłówek opakowania: "
|
||||
|
||||
#: g10/armor.c:326
|
||||
msgid "armor header: "
|
||||
@ -925,9 +915,9 @@ msgid "Use this key anyway? "
|
||||
msgstr "U¿yæ tego klucza pomimo to? "
|
||||
|
||||
#: g10/pkclist.c:291
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "key %08lX: subkey has been revoked!\n"
|
||||
msgstr "klucz %08lX: klucz został unieważniony!\n"
|
||||
msgstr "klucz %08lX: podklucz został unieważniony!\n"
|
||||
|
||||
#: g10/pkclist.c:321
|
||||
#, c-format
|
||||
@ -942,7 +932,7 @@ msgstr "%08lX: brak informacji aby obliczy
|
||||
#: g10/pkclist.c:341
|
||||
#, c-format
|
||||
msgid "%08lX: We do NOT trust this key\n"
|
||||
msgstr "%08lX: OSTRZEŻENIE: Nie ufamy temu kluczowi!\n"
|
||||
msgstr "%08lX: NIE UFAMY temu kluczowi\n"
|
||||
|
||||
#: g10/pkclist.c:347
|
||||
#, c-format
|
||||
@ -986,9 +976,8 @@ msgid " This could mean that the signature is forgery.\n"
|
||||
msgstr " To mo¿e oznaczaæ ¿e podpis jest fa³szerstwem.\n"
|
||||
|
||||
#: g10/pkclist.c:459
|
||||
#, fuzzy
|
||||
msgid "WARNING: This subkey has been revoked by its owner!\n"
|
||||
msgstr "OSTRZEŻENIE: Ten klucz został unieważniony przez właściciela!\n"
|
||||
msgstr "OSTRZEŻENIE: Ten podklucz został unieważniony przez właściciela!\n"
|
||||
|
||||
#: g10/pkclist.c:480
|
||||
msgid "Note: This key has expired!\n"
|
||||
@ -1006,7 +995,7 @@ msgstr ""
|
||||
|
||||
#: g10/pkclist.c:505
|
||||
msgid "WARNING: We do NOT trust this key!\n"
|
||||
msgstr "OSTRZEŻENIE: Nie ufamy temu kluczowi!\n"
|
||||
msgstr "OSTRZEŻENIE: NIE UFAMY temu kluczowi!\n"
|
||||
|
||||
#: g10/pkclist.c:506
|
||||
msgid " The signature is probably a FORGERY.\n"
|
||||
@ -1138,16 +1127,16 @@ msgstr "D
|
||||
#. * you start a discussion with Marvin about this theme and then
|
||||
#. * do whatever you want.
|
||||
#: g10/keygen.c:466
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "keysize too large; %d is largest value allowed.\n"
|
||||
msgstr "Długość klucza zbyt mała; minimalna dopuszczona wynosi 768 bitów.\n"
|
||||
msgstr "zbyt duży rozmiar klucza, ograniczenie wynosi %d.\n"
|
||||
|
||||
#: g10/keygen.c:471
|
||||
msgid ""
|
||||
"Keysizes larger than 2048 are not suggested because\n"
|
||||
"computations take REALLY long!\n"
|
||||
msgstr ""
|
||||
"Klucze dłuższe niż 2048 bitów są odradzane ponieważ obliczenia\n"
|
||||
"Klucze dłuższe niż 2048 bitów są odradzane, ponieważ obliczenia\n"
|
||||
"trwaj± wtedy BARDZO d³ugo!\n"
|
||||
|
||||
#: g10/keygen.c:474
|
||||
@ -1265,7 +1254,7 @@ msgstr "Niew
|
||||
#: g10/keygen.c:669
|
||||
#, c-format
|
||||
msgid "You are using the `%s' character set.\n"
|
||||
msgstr ""
|
||||
msgstr "Używasz zestawu znaków %s.\n"
|
||||
|
||||
#: g10/keygen.c:675
|
||||
#, c-format
|
||||
@ -1315,20 +1304,18 @@ msgstr ""
|
||||
"\n"
|
||||
|
||||
#: g10/keygen.c:775
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"We need to generate a lot of random bytes. It is a good idea to perform\n"
|
||||
"some other action (type on the keyboard, move the mouse, utilize the\n"
|
||||
"disks) during the prime generation; this gives the random number\n"
|
||||
"generator a better chance to gain enough entropy.\n"
|
||||
msgstr ""
|
||||
"Program musi wygenerować dużo losowych bajtów. Dobrze by było, zmusić "
|
||||
"komputer\n"
|
||||
"do równoległej pracy nad czymś innym (w innym oknie, wykonać jakieś ruchy\n"
|
||||
"myszką, użyć sieci albo odwołać się do dysku) podczas generacji liczb\n"
|
||||
"pierwszych; to daje komputerowi szansę zebrania dostatecznej ilości "
|
||||
"entropii\n"
|
||||
"do zasilenia generatora liczb losowych.\n"
|
||||
"Musimy wygenerować dużo losowych bajtów. Dobrym pomysłem podczas "
|
||||
"generowania\n"
|
||||
"liczb pierszych jest wykonanywanie w tym czasie innych działań (pisanie na\n"
|
||||
"klawiaturzeze, poruszanie myszką, odwołanie się do dysków); dzięki temu\n"
|
||||
"generator liczb losowych ma możliwość zebrania odpowiedniej ilości "
|
||||
"entropii.\n"
|
||||
|
||||
#: g10/keygen.c:845
|
||||
msgid "Key generation can only be used in interactive mode\n"
|
||||
@ -1448,9 +1435,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
|
||||
msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n"
|
||||
|
||||
#: g10/import.c:116
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "can't open `%s': %s\n"
|
||||
msgstr "nie mogę otworzyć %s: %s\n"
|
||||
msgstr "nie można otworzyć %s: %s\n"
|
||||
|
||||
#: g10/import.c:160
|
||||
#, c-format
|
||||
@ -1463,9 +1450,9 @@ msgid "%lu keys so far processed\n"
|
||||
msgstr "%lu kluczy przetworzonych do tej chwili\n"
|
||||
|
||||
#: g10/import.c:172
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "error reading `%s': %s\n"
|
||||
msgstr "błąd odczytu rekordu podpisu: %s\n"
|
||||
msgstr "błąd odczytu '%s': %s\n"
|
||||
|
||||
#: g10/import.c:175
|
||||
#, c-format
|
||||
@ -1551,14 +1538,12 @@ msgid "writing to `%s'\n"
|
||||
msgstr "zapis do '%s'\n"
|
||||
|
||||
#: g10/import.c:379 g10/import.c:435
|
||||
#, fuzzy
|
||||
msgid "can't lock keyring `%': %s\n"
|
||||
msgstr "nie mogę zablokować zbioru kluczy publicznych: %s\n"
|
||||
msgstr "nie można zablokować zbioru kluczy publicznych: %s\n"
|
||||
|
||||
#: g10/import.c:382
|
||||
#, fuzzy
|
||||
msgid "error writing keyring `%': %s\n"
|
||||
msgstr "%s: błąd zapisu numeru wersji: %s\n"
|
||||
msgstr "błąd zapisu zbioru kluczy '%': %s\n"
|
||||
|
||||
#: g10/import.c:387
|
||||
#, c-format
|
||||
@ -1581,9 +1566,9 @@ msgid "key %08lX: can't read original keyblock: %s\n"
|
||||
msgstr "klucz %08lX: nie mo¿na odczytaæ oryginalnego bloku klucza; %s\n"
|
||||
|
||||
#: g10/import.c:438 g10/import.c:547 g10/import.c:648
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "error writing keyring `%s': %s\n"
|
||||
msgstr "%s: błąd zapisu numeru wersji: %s\n"
|
||||
msgstr "błąd zapisu zbioru kluczy '%s': %s\n"
|
||||
|
||||
#: g10/import.c:444
|
||||
#, c-format
|
||||
@ -1621,9 +1606,9 @@ msgid "key %08lX: not changed\n"
|
||||
msgstr "klucz %08lX: bez zmian\n"
|
||||
|
||||
#: g10/import.c:544 g10/import.c:645
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "can't lock keyring `%s': %s\n"
|
||||
msgstr "nie mogę zablokować zbioru kluczy publicznych: %s\n"
|
||||
msgstr "nie można zablokować zbioru kluczy publicznych '%s': %s\n"
|
||||
|
||||
#: g10/import.c:552
|
||||
#, c-format
|
||||
@ -1701,11 +1686,9 @@ msgstr "klucz %08lX: podklucz pomini
|
||||
#. * the secret key used to create this signature - it
|
||||
#. * seems that this makes sense
|
||||
#: g10/import.c:798
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
|
||||
msgstr ""
|
||||
"klucz %08lX: certyfikat unieważnienia umieszczony w niewłaściwym \n"
|
||||
"miejscu - został pominięty\n"
|
||||
msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pominięty\n"
|
||||
|
||||
#: g10/import.c:807
|
||||
#, c-format
|
||||
@ -1722,7 +1705,7 @@ msgstr "klucz %08lX: niepoprawny certyfikat uniewa
|
||||
#: g10/import.c:915
|
||||
#, c-format
|
||||
msgid "key %08lX: duplicated user ID detected - merged\n"
|
||||
msgstr ""
|
||||
msgstr "key %08lX: powtórzony identyfikator użytkownika - dołączony\n"
|
||||
|
||||
#: g10/import.c:966
|
||||
#, c-format
|
||||
@ -1741,7 +1724,7 @@ msgstr "%s: nie znaleziono u
|
||||
|
||||
#: g10/keyedit.c:177
|
||||
msgid "[revocation]"
|
||||
msgstr ""
|
||||
msgstr "[unieważnienie]"
|
||||
|
||||
#: g10/keyedit.c:178
|
||||
msgid "[self-signature]"
|
||||
@ -1809,6 +1792,8 @@ msgid ""
|
||||
"The signature will be marked as non-exportable.\n"
|
||||
"\n"
|
||||
msgstr ""
|
||||
"Podpis zostanie oznaczony jako nieeksportowalny.\n"
|
||||
"\n"
|
||||
|
||||
#: g10/keyedit.c:321
|
||||
msgid "Really sign? "
|
||||
@ -1817,7 +1802,7 @@ msgstr "Na pewno podpisa
|
||||
#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
|
||||
#, c-format
|
||||
msgid "signing failed: %s\n"
|
||||
msgstr "podpisywanie nie powiodło się: %s\n"
|
||||
msgstr "złożenie podpisu nie powiodło się: %s\n"
|
||||
|
||||
#: g10/keyedit.c:400
|
||||
msgid "This key is not protected.\n"
|
||||
@ -1845,7 +1830,7 @@ msgid ""
|
||||
"You don't want a passphrase - this is probably a *bad* idea!\n"
|
||||
"\n"
|
||||
msgstr ""
|
||||
"Nie chcesz podać wyrażenia przejściowego (hasła) - to zły pomysł!\n"
|
||||
"Nie chcesz podać wyrażenia przejściowego (hasła) - to *zły* pomysł!\n"
|
||||
"\n"
|
||||
|
||||
#: g10/keyedit.c:440
|
||||
@ -1945,14 +1930,12 @@ msgid "s"
|
||||
msgstr "p"
|
||||
|
||||
#: g10/keyedit.c:551
|
||||
#, fuzzy
|
||||
msgid "lsign"
|
||||
msgstr "podpis"
|
||||
msgstr "lpodpis"
|
||||
|
||||
#: g10/keyedit.c:551
|
||||
#, fuzzy
|
||||
msgid "sign the key locally"
|
||||
msgstr "złożenie podpisu na kluczu"
|
||||
msgstr "złożenie lokalnego podpisu na kluczu"
|
||||
|
||||
#: g10/keyedit.c:552
|
||||
msgid "debug"
|
||||
@ -2035,28 +2018,24 @@ msgid "change the ownertrust"
|
||||
msgstr "zmiana zaufania w³a¶ciciela"
|
||||
|
||||
#: g10/keyedit.c:564
|
||||
#, fuzzy
|
||||
msgid "revsig"
|
||||
msgstr "podpis"
|
||||
msgstr "unpod"
|
||||
|
||||
#: g10/keyedit.c:564
|
||||
#, fuzzy
|
||||
msgid "revoke signatures"
|
||||
msgstr "wymuszenie trzeciej wersji formatu podpisów"
|
||||
msgstr "unieważnienie podpisu"
|
||||
|
||||
#: g10/keyedit.c:565
|
||||
#, fuzzy
|
||||
msgid "revkey"
|
||||
msgstr "klucz"
|
||||
msgstr "unpkl"
|
||||
|
||||
#: g10/keyedit.c:565
|
||||
#, fuzzy
|
||||
msgid "revoke a secondary key"
|
||||
msgstr "usunięcie podklucza"
|
||||
msgstr "unieważnienie podklucza"
|
||||
|
||||
#: g10/keyedit.c:584
|
||||
msgid "can't do that in batchmode\n"
|
||||
msgstr "operacja niemożliwa do wykonania w trybie wsadowym\n"
|
||||
msgstr "nie działa w trybie wsadowym\n"
|
||||
|
||||
#. check that they match
|
||||
#. FIXME: check that they both match
|
||||
@ -2137,14 +2116,12 @@ msgid "Do you really want to delete this key? "
|
||||
msgstr "Czy na pewno chcesz usun±æ ten klucz? "
|
||||
|
||||
#: g10/keyedit.c:846
|
||||
#, fuzzy
|
||||
msgid "Do you really want to revoke the selected keys? "
|
||||
msgstr "Czy na pewno chcesz usunąć wybrane klucze? "
|
||||
msgstr "Czy na pewno chcesz unieważnić wybrane klucze? "
|
||||
|
||||
#: g10/keyedit.c:847
|
||||
#, fuzzy
|
||||
msgid "Do you really want to revoke this key? "
|
||||
msgstr "Czy na pewno chcesz usunąć ten klucz? "
|
||||
msgstr "Czy na pewno chcesz unieważnić ten klucz? "
|
||||
|
||||
#: g10/keyedit.c:901
|
||||
msgid "Invalid command (try \"help\")\n"
|
||||
@ -2185,36 +2162,34 @@ msgid "No secondary key with index %d\n"
|
||||
msgstr "Brak podklucza o indeksie %d\n"
|
||||
|
||||
#: g10/keyedit.c:1566
|
||||
#, fuzzy
|
||||
msgid "user ID: \""
|
||||
msgstr "Wprowadź identyfikator użytkownika (user ID): "
|
||||
msgstr "Identyfikator użytkownika: "
|
||||
|
||||
#: g10/keyedit.c:1569
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid ""
|
||||
"\"\n"
|
||||
"signed with your key %08lX at %s\n"
|
||||
msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
|
||||
msgstr ""
|
||||
"\"\n"
|
||||
"podpisano Twoim kluczem %08lX w %s\n"
|
||||
|
||||
#: g10/keyedit.c:1573
|
||||
#, fuzzy
|
||||
msgid "Create a revocation certificate for this signature? (y/N)"
|
||||
msgstr "generacja certyfikatu unieważnienia klucza"
|
||||
msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N)"
|
||||
|
||||
#: g10/keyedit.c:1653
|
||||
#, fuzzy
|
||||
msgid "Really create the revocation certificates? (y/N)"
|
||||
msgstr "generacja certyfikatu unieważnienia klucza"
|
||||
msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N)"
|
||||
|
||||
#: g10/keyedit.c:1676
|
||||
#, fuzzy
|
||||
msgid "no secret key\n"
|
||||
msgstr "niepoprawny klucz prywatny"
|
||||
msgstr "brak klucza prywatnego\n"
|
||||
|
||||
#: g10/mainproc.c:184
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "public key is %08lX\n"
|
||||
msgstr "klucz publiczny nie odnaleziony"
|
||||
msgstr "klucz publiczny %08lX\n"
|
||||
|
||||
#: g10/mainproc.c:212
|
||||
msgid "public key encrypted data: good DEK\n"
|
||||
@ -2235,7 +2210,7 @@ msgstr "odszyfrowane poprawnie\n"
|
||||
|
||||
#: g10/mainproc.c:252
|
||||
msgid "WARNING: encrypted message has been manipulated!\n"
|
||||
msgstr ""
|
||||
msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
|
||||
|
||||
#: g10/mainproc.c:257
|
||||
#, c-format
|
||||
@ -2272,9 +2247,8 @@ msgid "Good signature from \""
|
||||
msgstr "Poprawny podpis z³o¿ony przez \""
|
||||
|
||||
#: g10/mainproc.c:925
|
||||
#, fuzzy
|
||||
msgid " aka \""
|
||||
msgstr " dołączono do zbioru: %lu"
|
||||
msgstr " alias \""
|
||||
|
||||
#: g10/mainproc.c:975
|
||||
#, c-format
|
||||
@ -2407,10 +2381,9 @@ msgstr ""
|
||||
"wyra¿enie przej¶ciowe (has³o).\n"
|
||||
|
||||
#: g10/sig-check.c:187
|
||||
#, fuzzy
|
||||
msgid "assuming bad MDC due to an unknown critical bit\n"
|
||||
msgstr ""
|
||||
"przyjęto nieważność podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
|
||||
"przyjęto niepoprawność MDC z powonu ustawienia nieznanego bitu krytycznego\n"
|
||||
|
||||
#: g10/sig-check.c:283
|
||||
msgid ""
|
||||
@ -2464,9 +2437,9 @@ msgid "can't handle text lines longer than %d characters\n"
|
||||
msgstr "nie mogê obs³u¿yæ linii tekstu d³u¿szej ni¿ %d znaków\n"
|
||||
|
||||
#: g10/textfilter.c:197
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "input line longer than %d characters\n"
|
||||
msgstr "błąd opakowania: linia dłuższa niż %d znaków\n"
|
||||
msgstr "linia dłuższa niż %d znaków\n"
|
||||
|
||||
#: g10/tdbio.c:116 g10/tdbio.c:1505
|
||||
#, c-format
|
||||
@ -2508,9 +2481,9 @@ msgid "%s: can't create: %s\n"
|
||||
msgstr "%s: nie mogê utworzyæ: %s\n"
|
||||
|
||||
#: g10/tdbio.c:472 g10/tdbio.c:521
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "%s: can't create lock\n"
|
||||
msgstr "%s: nie mogę utworzyć: %s\n"
|
||||
msgstr "%s: nie mogę utworzyć blokady\n"
|
||||
|
||||
#: g10/tdbio.c:486
|
||||
#, c-format
|
||||
@ -2823,14 +2796,12 @@ msgid "WARNING: can't yet handle long pref records\n"
|
||||
msgstr "OSTRZE¯ENIE: d³ugie wpisy ustawieñ jeszcze nie s± obs³ugiwane.\n"
|
||||
|
||||
#: g10/trustdb.c:1654
|
||||
#, fuzzy
|
||||
msgid "duplicated certificate - deleted"
|
||||
msgstr "Podwójna kopia certyfikatu - usunięta"
|
||||
msgstr "podwójny certyfikat - usunięty"
|
||||
|
||||
#: g10/trustdb.c:1692
|
||||
#, fuzzy
|
||||
msgid "public key not anymore available"
|
||||
msgstr "klucz tajny jest niedostępny"
|
||||
msgstr "klucz publiczny jest już niedostępny"
|
||||
|
||||
#: g10/trustdb.c:1702 g10/trustdb.c:1791
|
||||
msgid "Invalid certificate revocation"
|
||||
@ -2914,7 +2885,7 @@ msgstr "\t%lu kluczy uaktualnionych\n"
|
||||
#: g10/trustdb.c:2568
|
||||
#, c-format
|
||||
msgid "\t%lu keys inserted\n"
|
||||
msgstr " %lu kluczy wpisanych\n"
|
||||
msgstr "\t%lu kluczy wpisanych\n"
|
||||
|
||||
#: g10/trustdb.c:2571
|
||||
#, c-format
|
||||
@ -3094,8 +3065,7 @@ msgstr "zaszyfrowane nieznanym algorytmem %d\n"
|
||||
msgid ""
|
||||
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
|
||||
msgstr ""
|
||||
"OSTRZEŻENIE: Informacje były szyfrowane słabym kluczem szyfru "
|
||||
"symetrycznego.\n"
|
||||
"OSTRZEŻENIE: wiadomość była szyfrowana słabym kluczem szyfru symetrycznego.\n"
|
||||
|
||||
#: g10/seskey.c:52
|
||||
msgid "weak key created - retrying\n"
|
||||
@ -3135,7 +3105,7 @@ msgstr "Podaj identyfikator u
|
||||
#: g10/helptext.c:66
|
||||
msgid "keygen.algo"
|
||||
msgstr ""
|
||||
"Wybór algorytmu.\n"
|
||||
"Wybór algorytmu:\n"
|
||||
"DSA (znany te¿ jako DSS) to Algorytm Podpisu Cyfrowego - u¿ywaæ go mo¿na "
|
||||
"tylko\n"
|
||||
"do tworzenia cyfrowych podpisów. Jego wybór jest sugerowany poniewa¿\n"
|
||||
@ -3299,16 +3269,14 @@ msgstr "Brak pomocy o '%s'"
|
||||
#~ msgid "can't write keyring: %s\n"
|
||||
#~ msgstr "niemo¿liwy jest zapis zbioru kluczy: %s\n"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "encrypted message is valid\n"
|
||||
#~ msgstr "wybrany algorytm geenracji skrótów wiadomości jest niepoprawny\n"
|
||||
#~ msgstr "zaszyfrowana wiadomość jest poprawna\n"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "Can't check MDC: %s\n"
|
||||
#~ msgstr "Nie mogę sprawdzić podpisu: %s\n"
|
||||
#~ msgstr "Sprawdzenie MDC niemożliwe: %s\n"
|
||||
|
||||
#~ msgid "Usage: gpgm [options] [files] (-h for help)"
|
||||
#~ msgstr "Sposób użycia: gpgm [opcje] [pliki] (-h podaje pomoc)"
|
||||
#~ msgstr "Wywołanie: gpgm [opcje] [pliki] (-h podaje pomoc)"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Syntax: gpgm [options] [files]\n"
|
||||
@ -3395,7 +3363,7 @@ msgstr "Brak pomocy o '%s'"
|
||||
#~ msgstr "b³±d podczas poszukiwania wpisu katalogowego: %s\n"
|
||||
|
||||
#~ msgid "Hmmm, public key lost?"
|
||||
#~ msgstr "Hmmm, klucz publiczny starcony?"
|
||||
#~ msgstr "Hmmm, klucz publiczny utracony?"
|
||||
|
||||
#~ msgid "did not use primary key for insert_trust_record()\n"
|
||||
#~ msgstr "g³owny klucz nie zosta³ u¿yty w procedurze insert_trust_record()\n"
|
||||
|
||||
@ -16,9 +16,13 @@ Provides: gpg openpgp
|
||||
BuildRoot: /tmp/rpmbuild_%{name}
|
||||
|
||||
%changelog
|
||||
* Sat May 29 1999 Fabio Coatti <cova@ferrara.linux.it>
|
||||
- Some corrections in French description, thanks to
|
||||
Gaël Quéri <gqueri@mail.dotcom.fr>
|
||||
|
||||
* Mon May 17 1999 Fabio Coatti <cova@felix.unife.it>
|
||||
- Added French description, provided by Christophe Labouisse <labouiss@cybercable.fr>
|
||||
- Added French description, provided by
|
||||
Christophe Labouisse <labouiss@cybercable.fr>
|
||||
|
||||
* Thu May 06 1999 Fabio Coatti <cova@felix.unife.it>
|
||||
- Upgraded for 0.9.6 (removed gpgm)
|
||||
@ -49,9 +53,9 @@ IDEA o RSA pu
|
||||
alle specifiche OpenPGP (RFC2440).
|
||||
|
||||
%description -l fr
|
||||
GnuPG est remplacement complet et "libre" de PGP. Comme il n'utilise
|
||||
GnuPG est un remplacement complet et « libre » de PGP. Comme il n'utilise
|
||||
ni IDEA ni RSA il peut être utilisé sans restriction. GnuPG est conforme
|
||||
avec la spécification OpenPGP (RFC2440).
|
||||
à la spécification OpenPGP (RFC2440).
|
||||
|
||||
%prep
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
Mon May 31 19:41:10 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* iobuf.c (file_filter,block_filter): Speed patches (Rémi).
|
||||
|
||||
Thu May 27 09:40:55 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
|
||||
|
||||
* miscutil.c (answer_is_yes_no_quit): New.
|
||||
|
||||
78
util/iobuf.c
78
util/iobuf.c
@ -89,33 +89,28 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
|
||||
FILE *fp = a->fp;
|
||||
size_t size = *ret_len;
|
||||
size_t nbytes = 0;
|
||||
int c, rc = 0;
|
||||
char *p;
|
||||
int rc = 0;
|
||||
|
||||
if( control == IOBUFCTRL_UNDERFLOW ) {
|
||||
assert( size ); /* need a buffer */
|
||||
for(; size; size-- ) {
|
||||
if( (c=getc(fp)) == EOF ) {
|
||||
if( ferror(fp) && errno != EPIPE ) {
|
||||
log_error("%s: read error: %s\n",
|
||||
a->fname, strerror(errno));
|
||||
rc = G10ERR_READ_FILE;
|
||||
}
|
||||
else if( !nbytes )
|
||||
rc = -1; /* okay: we can return EOF now. */
|
||||
break;
|
||||
}
|
||||
buf[nbytes++] = c & 0xff;
|
||||
clearerr( fp );
|
||||
nbytes = fread( buf, 1, size, fp );
|
||||
if( feof(fp) && !nbytes )
|
||||
rc = -1; /* okay: we can return EOF now. */
|
||||
else if( ferror(fp) && errno != EPIPE ) {
|
||||
log_error("%s: read error: %s\n",
|
||||
a->fname, strerror(errno));
|
||||
rc = G10ERR_READ_FILE;
|
||||
}
|
||||
*ret_len = nbytes;
|
||||
}
|
||||
else if( control == IOBUFCTRL_FLUSH ) {
|
||||
for(p=buf; nbytes < size; nbytes++, p++ ) {
|
||||
if( putc(*p, fp) == EOF ) {
|
||||
log_error("%s: write error: %s\n",
|
||||
a->fname, strerror(errno));
|
||||
if( size ) {
|
||||
clearerr( fp );
|
||||
nbytes = fwrite( buf, 1, size, fp );
|
||||
if( ferror(fp) ) {
|
||||
log_error("%s: write error: %s\n", a->fname, strerror(errno));
|
||||
rc = G10ERR_WRITE_FILE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
*ret_len = nbytes;
|
||||
@ -149,7 +144,7 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
|
||||
{
|
||||
block_filter_ctx_t *a = opaque;
|
||||
size_t size = *ret_len;
|
||||
int c, rc = 0;
|
||||
int c, needed, rc = 0;
|
||||
char *p;
|
||||
|
||||
if( control == IOBUFCTRL_UNDERFLOW ) {
|
||||
@ -239,15 +234,20 @@ block_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
|
||||
}
|
||||
}
|
||||
|
||||
for(; !rc && size && a->size; size--, a->size-- ) {
|
||||
if( (c=iobuf_get(chain)) == -1 ) {
|
||||
while( !rc && size && a->size ) {
|
||||
needed = size < a->size ? size : a->size;
|
||||
c = iobuf_read( chain, p, needed );
|
||||
if( c < needed ) {
|
||||
if( c == -1 ) c = 0;
|
||||
log_error("block_filter %p: read error (size=%lu,a->size=%lu)\n",
|
||||
a, (ulong)size, (ulong)a->size);
|
||||
a, (ulong)size+c, (ulong)a->size+c);
|
||||
rc = G10ERR_READ_FILE;
|
||||
}
|
||||
else {
|
||||
*p++ = c;
|
||||
n++;
|
||||
size -= c;
|
||||
a->size -= c;
|
||||
p += c;
|
||||
n += c;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1058,28 +1058,36 @@ iobuf_read(IOBUF a, byte *buf, unsigned buflen )
|
||||
|
||||
if( a->unget.buf || a->nlimit ) {
|
||||
/* handle special cases */
|
||||
for(n=0 ; n < buflen; n++, buf++ ) {
|
||||
for(n=0 ; n < buflen; n++ ) {
|
||||
if( (c = iobuf_readbyte(a)) == -1 ) {
|
||||
if( !n )
|
||||
return -1; /* eof */
|
||||
break;
|
||||
}
|
||||
else
|
||||
*buf = c;
|
||||
if( buf ) *buf = c;
|
||||
if( buf ) buf++;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
n = 0;
|
||||
do {
|
||||
for( ; n < buflen && a->d.start < a->d.len; n++ )
|
||||
*buf++ = a->d.buf[a->d.start++];
|
||||
if( n < buflen && a->d.start < a->d.len ) {
|
||||
unsigned size = a->d.len - a->d.start;
|
||||
if( size > buflen - n ) size = buflen - n;
|
||||
if( buf ) memcpy( buf, a->d.buf + a->d.start, size );
|
||||
n += size;
|
||||
a->d.start += size;
|
||||
if( buf ) buf += size;
|
||||
}
|
||||
if( n < buflen ) {
|
||||
if( (c=underflow(a)) == -1 ) {
|
||||
a->nbytes += n;
|
||||
return n? n : -1/*EOF*/;
|
||||
}
|
||||
*buf++ = c; n++;
|
||||
if( buf ) *buf++ = c;
|
||||
n++;
|
||||
}
|
||||
} while( n < buflen );
|
||||
a->nbytes += n;
|
||||
@ -1140,8 +1148,14 @@ iobuf_write(IOBUF a, byte *buf, unsigned buflen )
|
||||
BUG();
|
||||
|
||||
do {
|
||||
for( ; buflen && a->d.len < a->d.size; buflen--, buf++ )
|
||||
a->d.buf[a->d.len++] = *buf;
|
||||
if( buflen && a->d.len < a->d.size ) {
|
||||
unsigned size = a->d.size - a->d.len;
|
||||
if( size > buflen ) size = buflen;
|
||||
memcpy( a->d.buf + a->d.len, buf, size );
|
||||
buflen -= size;
|
||||
buf += size;
|
||||
a->d.len += size;
|
||||
}
|
||||
if( buflen ) {
|
||||
if( iobuf_flush(a) )
|
||||
return -1;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user