diff options
| -rw-r--r-- | doc/DETAILS | 54 | ||||
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/armor.c | 17 | ||||
| -rw-r--r-- | po/de.po | 24 | ||||
| -rw-r--r-- | po/es_ES.po | 24 | ||||
| -rw-r--r-- | po/fr.po | 24 | ||||
| -rw-r--r-- | po/it.po | 24 | ||||
| -rw-r--r-- | po/pl.po | 24 | ||||
| -rw-r--r-- | po/pt_BR.po | 24 | ||||
| -rw-r--r-- | po/ru.po | 24 |
10 files changed, 126 insertions, 117 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index fb26c2b16..27a8d9d4b 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -155,12 +155,12 @@ describes the record type. All numeric values are stored in network byte order. The length of each record is 40 bytes. The first record of the DB is always of type 2 and this is the only record of this type. -Record type 0: --------------- + Record type 0: + -------------- Unused record, can be reused for any purpose. -Record type 1: --------------- + Record type 1: + -------------- Version information for this TrustDB. This is always the first record of the DB and the only one with type 1. 1 byte value 1 @@ -187,8 +187,8 @@ Record type 1: 4 bytes reserved for version extension record -Record type 2: (directory record) --------------- + Record type 2: (directory record) + -------------- Informations about a public key certificate. These are static values which are never changed without user interaction. @@ -205,8 +205,8 @@ Record type 2: (directory record) 15 byte reserved -Record type 3: (key record) --------------- + Record type 3: (key record) + -------------- Informations about a primary public key. (This is mainly used to lookup a trust record) @@ -221,8 +221,8 @@ Record type 3: (key record) 20 bytes fingerprint of the public key (This is the value we use to identify a key) -Record type 4: (uid record) --------------- + Record type 4: (uid record) + -------------- Informations about a userid We do not store the userid but the hash value of the userid because that is sufficient. @@ -238,8 +238,8 @@ Record type 4: (uid record) 20 bytes ripemd160 hash of the username. -Record type 5: (pref record) --------------- + Record type 5: (pref record) + -------------- Informations about preferences 1 byte value 5 @@ -249,8 +249,8 @@ Record type 5: (pref record) 1 u32 next 30 byte preference data -Record type 6 (sigrec) -------------- + Record type 6 (sigrec) + ------------- Used to keep track of key signatures. Self-signatures are not stored. If a public key is not in the DB, the signature points to a shadow dir record, which in turn has a list of records which @@ -270,8 +270,8 @@ Record type 6 (sigrec) -Record type 8: (shadow directory record) --------------- + Record type 8: (shadow directory record) + -------------- This record is used to reserved a LID for a public key. We need this to create the sig records of other keys, even if we do not yet have the public key of the signature. @@ -294,8 +294,8 @@ Record type 8: (shadow directory record) -Record Type 10 (hash table) --------------- + Record Type 10 (hash table) + -------------- Due to the fact that we use fingerprints to lookup keys, we can implement quick access by some simple hash methods, and avoid the overhead of gdbm. A property of fingerprints is that they can be @@ -332,8 +332,8 @@ Record Type 10 (hash table) fingerprint and to decide whether it is the requested key; -Record type 11 (hash list) --------------- + Record type 11 (hash list) + -------------- see hash table for an explanation. This is also used for other purposes. @@ -347,8 +347,8 @@ Record type 11 (hash list) -Record type 254 (free record) ---------------- + Record type 254 (free record) + --------------- All these records form a linked list of unused records. 1 byte value 254 1 byte reserved (0) @@ -452,17 +452,17 @@ Other Notes Keyserver Message Format -------------------------- +========================= The keyserver may be contacted by a Unix Domain socket or via TCP. The format of a request is: ----- +==== command-tag "Content-length:" digits CRLF ------- +======= Where command-tag is @@ -474,11 +474,11 @@ DELETE <user-name> The format of a response is: ------- +====== "GNUPG/1.0" status-code status-text "Content-length:" digits CRLF ------------- +============ followed by <digits> bytes of data diff --git a/g10/ChangeLog b/g10/ChangeLog index f46837283..274637a4b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 20 13:59:47 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * armor.c (fake_packet): Fix for not not-dash-escaped + Sat Mar 20 11:44:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de> * g10.c (main): Added command --recv-keys diff --git a/g10/armor.c b/g10/armor.c index a6daf7110..cadebadbb 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -503,13 +503,18 @@ fake_packet( armor_filter_context_t *afx, IOBUF a, afx->buffer_pos = 2; /* skip */ } else if( n >= 15 && p[1] == '-' && p[2] == '-' && p[3] == '-' ) { - if( is_armor_header( p, n ) != BEGIN_SIGNATURE ) { - log_info(_("unexpected armor:")); - print_string( stderr, p, n, 0 ); - putc('\n', stderr); + int type = is_armor_header( p, n ); + if( afx->not_dash_escaped && type != BEGIN_SIGNATURE ) + ; /* this is okay */ + else { + if( type != BEGIN_SIGNATURE ) { + log_info(_("unexpected armor:")); + print_string( stderr, p, n, 0 ); + putc('\n', stderr); + } + lastline = 1; + rc = -1; } - lastline = 1; - rc = -1; } } } @@ -3,7 +3,7 @@ # Walter Koch <walterk@dip.de>, 1998. msgid "" msgstr "" -"POT-Creation-Date: 1999-03-20 12:42+0100\n" +"POT-Creation-Date: 1999-03-20 13:40+0100\n" "PO-Revision-Date: 1999-03-08 13:34+0100\n" "Last-Translator: Walter Koch <walterk@mail.dip.de>\n" "Language-Team: German <de@li.org>\n" @@ -781,50 +781,50 @@ msgstr "verschachtelte Klartextunterschriften\n" msgid "invalid dash escaped line: " msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: " -#: g10/armor.c:507 +#: g10/armor.c:511 msgid "unexpected armor:" msgstr "Unerwartete ASCII-Hülle:" -#: g10/armor.c:623 +#: g10/armor.c:628 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n" -#: g10/armor.c:666 +#: g10/armor.c:671 msgid "premature eof (no CRC)\n" msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n" -#: g10/armor.c:700 +#: g10/armor.c:705 msgid "premature eof (in CRC)\n" msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n" -#: g10/armor.c:704 +#: g10/armor.c:709 msgid "malformed CRC\n" msgstr "Falsch aufgebaute Prüfsumme\n" -#: g10/armor.c:708 +#: g10/armor.c:713 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Prüfsummenfehler; %06lx - %06lx\n" -#: g10/armor.c:725 +#: g10/armor.c:730 msgid "premature eof (in Trailer)\n" msgstr "vorzeitiges Dateiende (im Nachsatz)\n" -#: g10/armor.c:729 +#: g10/armor.c:734 msgid "error in trailer line\n" msgstr "Fehler in der Nachsatzzeile\n" -#: g10/armor.c:993 +#: g10/armor.c:998 msgid "no valid OpenPGP data found.\n" msgstr "Keine gültigen OpenPGP-Daten gefunden.\n" -#: g10/armor.c:997 +#: g10/armor.c:1002 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n" -#: g10/armor.c:1001 +#: g10/armor.c:1006 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 9c60b0b8b..bc11aaa27 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ # I also got inspiration from it.po by Marco d'Itri <md@linux.it> msgid "" msgstr "" -"POT-Creation-Date: 1999-03-20 12:42+0100\n" +"POT-Creation-Date: 1999-03-20 13:40+0100\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" "From: Urko Lusa <ulusa@lacueva.ddns.org>\n" @@ -784,50 +784,50 @@ msgstr "firmas en texto claro anidadas\n" msgid "invalid dash escaped line: " msgstr "Línea con guiones no válida: " -#: g10/armor.c:507 +#: g10/armor.c:511 msgid "unexpected armor:" msgstr "armadura inesperada" -#: g10/armor.c:623 +#: g10/armor.c:628 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "caracteres no válidos radix64 %02x ignorados\n" -#: g10/armor.c:666 +#: g10/armor.c:671 msgid "premature eof (no CRC)\n" msgstr "Fin de fichero prematuro\n" -#: g10/armor.c:700 +#: g10/armor.c:705 msgid "premature eof (in CRC)\n" msgstr "Fin de suma de comprobación prematuro\n" -#: g10/armor.c:704 +#: g10/armor.c:709 msgid "malformed CRC\n" msgstr "Suma de comprobación mal creada\n" -#: g10/armor.c:708 +#: g10/armor.c:713 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Error en suma de comprobación: %06lx - %06lx\n" -#: g10/armor.c:725 +#: g10/armor.c:730 msgid "premature eof (in Trailer)\n" msgstr "fin de fichero prematuro (en el cierre)\n" -#: g10/armor.c:729 +#: g10/armor.c:734 msgid "error in trailer line\n" msgstr "error en la línea de cierre\n" -#: g10/armor.c:993 +#: g10/armor.c:998 msgid "no valid OpenPGP data found.\n" msgstr "no se han encontrados datos OpenPGP válidos\n" -#: g10/armor.c:997 +#: g10/armor.c:1002 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "armadura inválida: línea más larga de %d caracteres\n" -#: g10/armor.c:1001 +#: g10/armor.c:1006 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 0.9.0a\n" -"POT-Creation-Date: 1999-03-20 12:42+0100\n" +"POT-Creation-Date: 1999-03-20 13:40+0100\n" "PO-Revision-Date: 1999-01-09 00:25+01:00\n" "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n" "Language-Team: French <fr@li.org>\n" @@ -778,50 +778,50 @@ msgstr "signatures en texte clair imbriquées\n" msgid "invalid dash escaped line: " msgstr "ligne de traits d'échappement invalide : " -#: g10/armor.c:507 +#: g10/armor.c:511 msgid "unexpected armor:" msgstr "armure inattendue :" -#: g10/armor.c:623 +#: g10/armor.c:628 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "caractère %02x invalide en base 64 ignoré\n" -#: g10/armor.c:666 +#: g10/armor.c:671 msgid "premature eof (no CRC)\n" msgstr "fin de fichier prématurée (pas de CRC)\n" -#: g10/armor.c:700 +#: g10/armor.c:705 msgid "premature eof (in CRC)\n" msgstr "fin de fichier prématurée (dans le CRC)\n" -#: g10/armor.c:704 +#: g10/armor.c:709 msgid "malformed CRC\n" msgstr "CRC malformé\n" -#: g10/armor.c:708 +#: g10/armor.c:713 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Erreur de CRC ; %06lx - %06lx\n" -#: g10/armor.c:725 +#: g10/armor.c:730 msgid "premature eof (in Trailer)\n" msgstr "fin de fichier prématurée (dans la remorque)\n" -#: g10/armor.c:729 +#: g10/armor.c:734 msgid "error in trailer line\n" msgstr "erreur dans la ligne de remorque\n" -#: g10/armor.c:993 +#: g10/armor.c:998 msgid "no valid OpenPGP data found.\n" msgstr "aucune de donnée OpenPGP valide n'a été trouvée.\n" -#: g10/armor.c:997 +#: g10/armor.c:1002 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "armure invalide : ligne plus longue que %d caractères\n" -#: g10/armor.c:1001 +#: g10/armor.c:1006 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.3\n" -"POT-Creation-Date: 1999-03-20 12:42+0100\n" +"POT-Creation-Date: 1999-03-20 13:40+0100\n" "PO-Revision-Date: 1998-11-09 16:19+01:00\n" "Last-Translator: Marco d'Itri <md@linux.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -820,52 +820,52 @@ msgstr "|[file]|fai una firma mantenendo il testo in chiaro" msgid "invalid dash escaped line: " msgstr "riga protetta con il trattino non valida: " -#: g10/armor.c:507 +#: g10/armor.c:511 #, fuzzy msgid "unexpected armor:" msgstr "Dati inaspettati" -#: g10/armor.c:623 +#: g10/armor.c:628 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Carattere radix64 non valido %02x saltato\n" -#: g10/armor.c:666 +#: g10/armor.c:671 msgid "premature eof (no CRC)\n" msgstr "eof prematura (nessun CRC)\n" -#: g10/armor.c:700 +#: g10/armor.c:705 msgid "premature eof (in CRC)\n" msgstr "eof prematura (nel CRC)\n" -#: g10/armor.c:704 +#: g10/armor.c:709 msgid "malformed CRC\n" msgstr "CRC malformato\n" -#: g10/armor.c:708 +#: g10/armor.c:713 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "errore nel CRC; %06lx - %06lx\n" -#: g10/armor.c:725 +#: g10/armor.c:730 msgid "premature eof (in Trailer)\n" msgstr "eof prematura (nella coda)\n" -#: g10/armor.c:729 +#: g10/armor.c:734 msgid "error in trailer line\n" msgstr "errore nella riga della coda\n" -#: g10/armor.c:993 +#: g10/armor.c:998 #, fuzzy msgid "no valid OpenPGP data found.\n" msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n" -#: g10/armor.c:997 +#: g10/armor.c:1002 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" -#: g10/armor.c:1001 +#: g10/armor.c:1006 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.9.2\n" -"POT-Creation-Date: 1999-03-20 12:42+0100\n" +"POT-Creation-Date: 1999-03-20 13:40+0100\n" "PO-Revision-Date: 1999-01-26 01:30+01:00\n" "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -783,50 +783,50 @@ msgstr "zagnie¿d¿one podpisy na czytelnym dokumencie\n" msgid "invalid dash escaped line: " msgstr "niepoprawne oznaczenie linii minusami:" -#: g10/armor.c:507 +#: g10/armor.c:511 msgid "unexpected armor:" msgstr "nieoczekiwane opakowanie:" -#: g10/armor.c:623 +#: g10/armor.c:628 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "niew³a¶ciwy znak formatu radix64 %02x zosta³ pominiêty\n" -#: g10/armor.c:666 +#: g10/armor.c:671 msgid "premature eof (no CRC)\n" msgstr "przewczesny koniec pliku (brak CRC)\n" -#: g10/armor.c:700 +#: g10/armor.c:705 msgid "premature eof (in CRC)\n" msgstr "przedwczesny koniec pliku (w CRC)\n" -#: g10/armor.c:704 +#: g10/armor.c:709 msgid "malformed CRC\n" msgstr "b³±d formatu CRC\n" -#: g10/armor.c:708 +#: g10/armor.c:713 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "B³±d sumy CRC; %06lx - %06lx\n" -#: g10/armor.c:725 +#: g10/armor.c:730 msgid "premature eof (in Trailer)\n" msgstr "przedwczesny koniec pliku (w linii koñcz±cej)\n" -#: g10/armor.c:729 +#: g10/armor.c:734 msgid "error in trailer line\n" msgstr "b³±d w linii koñcz±cej\n" -#: g10/armor.c:993 +#: g10/armor.c:998 msgid "no valid OpenPGP data found.\n" msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n" -#: g10/armor.c:997 +#: g10/armor.c:1002 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "b³±d opakowania: linia d³u¿sza ni¿ %d znaków\n" -#: g10/armor.c:1001 +#: g10/armor.c:1006 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 44d9fc76a..dd0b1561c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-03-20 12:42+0100\n" +"POT-Creation-Date: 1999-03-20 13:40+0100\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" @@ -826,52 +826,52 @@ msgstr "|[arquivo]|faz uma assinatura em texto puro" msgid "invalid dash escaped line: " msgstr "linha com hífen inválida: " -#: g10/armor.c:507 +#: g10/armor.c:511 #, fuzzy msgid "unexpected armor:" msgstr "Dados inesperados" -#: g10/armor.c:623 +#: g10/armor.c:628 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "caractere radix64 inválido %02x ignorado\n" -#: g10/armor.c:666 +#: g10/armor.c:671 msgid "premature eof (no CRC)\n" msgstr "fim de arquivo prematuro (sem CRC)\n" -#: g10/armor.c:700 +#: g10/armor.c:705 msgid "premature eof (in CRC)\n" msgstr "fim de arquivo prematuro (no CRC)\n" -#: g10/armor.c:704 +#: g10/armor.c:709 msgid "malformed CRC\n" msgstr "CRC malformado\n" -#: g10/armor.c:708 +#: g10/armor.c:713 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "erro de CRC; %06lx - %06lx\n" -#: g10/armor.c:725 +#: g10/armor.c:730 msgid "premature eof (in Trailer)\n" msgstr "fim de arquivo prematuro (no \"Trailer\")\n" -#: g10/armor.c:729 +#: g10/armor.c:734 msgid "error in trailer line\n" msgstr "erro na linha \"trailer\"\n" -#: g10/armor.c:993 +#: g10/armor.c:998 #, fuzzy msgid "no valid OpenPGP data found.\n" msgstr "nenum dado RFC1991 ou OpenPGP válido encontrado.\n" -#: g10/armor.c:997 +#: g10/armor.c:1002 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" -#: g10/armor.c:1001 +#: g10/armor.c:1006 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" @@ -9,7 +9,7 @@ # QingLong <qinglong@Bolizm> (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1999-03-20 12:42+0100\n" +"POT-Creation-Date: 1999-03-20 13:40+0100\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck <steuck@iname.com>\n" @@ -846,52 +846,52 @@ msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ" msgid "invalid dash escaped line: " msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: " -#: g10/armor.c:507 +#: g10/armor.c:511 #, fuzzy msgid "unexpected armor:" msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ" -#: g10/armor.c:623 +#: g10/armor.c:628 #, fuzzy, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n" -#: g10/armor.c:666 +#: g10/armor.c:671 msgid "premature eof (no CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (ÎÅÔ CRC)\n" -#: g10/armor.c:700 +#: g10/armor.c:705 msgid "premature eof (in CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× CRC)\n" -#: g10/armor.c:704 +#: g10/armor.c:709 msgid "malformed CRC\n" msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n" -#: g10/armor.c:708 +#: g10/armor.c:713 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n" -#: g10/armor.c:725 +#: g10/armor.c:730 msgid "premature eof (in Trailer)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n" -#: g10/armor.c:729 +#: g10/armor.c:734 msgid "error in trailer line\n" msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n" -#: g10/armor.c:993 +#: g10/armor.c:998 #, fuzzy msgid "no valid OpenPGP data found.\n" msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n" -#: g10/armor.c:997 +#: g10/armor.c:1002 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" -#: g10/armor.c:1001 +#: g10/armor.c:1006 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" |