diff --git a/NEWS b/NEWS index ba424e255..1b05d154b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ + + * New option --ignore-crc-error + Noteworthy changes in version 1.0.4 (2000-10-17) ------------------------------------------------ diff --git a/THANKS b/THANKS index 6132cdc89..a28fe6497 100644 --- a/THANKS +++ b/THANKS @@ -81,6 +81,7 @@ Karl Fogel kfogel@guanabana.onshore.com Karsten Thygesen karthy@kom.auc.dk Katsuhiro Kondou kondou@nec.co.jp Kazu Yamamoto kazu@iijlab.net +Klaus Singvogel ks@caldera.de Lars Kellogg-Stedman lars@bu.edu L. Sassaman rabbi@quickie.net Marco d'Itri md@linux.it diff --git a/doc/ChangeLog b/doc/ChangeLog index fcf681793..a50ab8090 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,12 @@ +2000-10-19 Werner Koch + + * gpg.sgml: Fixed doc for --allow-non-selfsigned-uid. + Add entry for --ignore-crc-error. + +2000-10-18 Werner Koch + + * OpenPGP: Dropped the paragraph that RSA is not implemented. + 2000-10-14 Werner Koch * faq.raw: Add an answer to the problem of multiple signatures. diff --git a/doc/OpenPGP b/doc/OpenPGP index ba44d87fb..a511ad7fd 100644 --- a/doc/OpenPGP +++ b/doc/OpenPGP @@ -8,11 +8,7 @@ Compatibility Notes =================== - GnuPG (>0.4.5) is in compliance with RFC2440 despite these exceptions: - - * (9.1) states that RSA SHOULD be implemented. This is not done - (except with an extension, usable outside the U.S.) due to - patent problems. + GnuPG (>=1.0.3) is in compliance with RFC2440 despite these exceptions: * (9.2) states that IDEA SHOULD be implemented. This is not done due to patent problems. @@ -21,7 +17,7 @@ All MAY features are implemented with this exception: * multi-part armored messages are not supported. - MIME should be used instead. + MIME (rfc2015) should be used instead. Most of the OPTIONAL stuff is implemented. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index ba80d8acb..1899b2c69 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1193,8 +1193,9 @@ This option might not be implemented yet. --allow-non-selfsigned-uid -Allow the import of keys with user IDs which are not self-signed. -This is only allows the import - key validation will fail and you +Allow the import of keys with user IDs which are not self-signed, but +have at least one signature. +This only allows the import - key validation will fail and you have to check the validity of the key my other means. This hack is needed for some German keys generated with pgp 2.6.3in. You should really avoid using it, because OpenPGP has better mechanics to do separate signing @@ -1219,6 +1220,17 @@ be older than the key due to clock problems. This option makes these checks just a warning. + +--ignore-crc-error + +The ASCII armor used by OpenPG is protected by a CRC checksum against +transmission errors. Sometimes it happens that the CRC gets mangled +somewhere on the transmission channel +but the actual content (which is anyway protected by +the OpenPGP protocol) is still okay. This options will let gpg ignore +CRC errors. + + --lock-once diff --git a/g10/ChangeLog b/g10/ChangeLog index aa5a9dae6..e776f171c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2000-10-19 Werner Koch + + * g10.c: New option --ignore-crc-error + * armor.c (invalid_crc): New. + (radix64_read): Act on new option. + + * openfile.c (try_make_homedir): Klaus Singvogel fixed a stupid + error introduced on Sep 6th. + 2000-10-18 Werner Koch * misc.c (print_cipher_algo_note): Don't print the note for AES. diff --git a/g10/armor.c b/g10/armor.c index cc7d97214..576a15ff4 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -590,6 +590,15 @@ fake_packet( armor_filter_context_t *afx, IOBUF a, } +static int +invalid_crc(void) +{ + if ( opt.ignore_crc_error ) + return 0; + log_inc_errorcount(); + return G10ERR_INVALID_ARMOR; +} + static int radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, @@ -728,17 +737,17 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, break; /* eof */ } while( ++idx < 4 ); if( c == -1 ) { - log_error(_("premature eof (in CRC)\n")); - rc = G10ERR_INVALID_ARMOR; - } + log_info(_("premature eof (in CRC)\n")); + rc = invalid_crc(); + } else if( idx != 4 ) { - log_error(_("malformed CRC\n")); - rc = G10ERR_INVALID_ARMOR; + log_info(_("malformed CRC\n")); + rc = invalid_crc(); } else if( mycrc != afx->crc ) { - log_error(_("CRC error; %06lx - %06lx\n"), + log_info (_("CRC error; %06lx - %06lx\n"), (ulong)afx->crc, (ulong)mycrc); - rc = G10ERR_INVALID_ARMOR; + rc = invalid_crc(); } else { rc = 0; diff --git a/g10/g10.c b/g10/g10.c index 9ba7e8942..9fabc9360 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -189,6 +189,7 @@ enum cmd_and_opt_values { aNull = 0, oFastListMode, oListOnly, oIgnoreTimeConflict, + oIgnoreCrcError, oShowSessionKey, oOverrideSessionKey, oNoRandomSeedFile, @@ -378,6 +379,7 @@ static ARGPARSE_OPTS opts[] = { { oFastListMode,"fast-list-mode", 0, "@" }, { oListOnly, "list-only", 0, "@"}, { oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" }, + { oIgnoreCrcError, "ignore-crc-error", 0,"@" }, { oShowSessionKey, "show-session-key", 0, "@" }, { oOverrideSessionKey, "override-session-key", 2, "@" }, { oNoRandomSeedFile, "no-random-seed-file", 0, "@" }, @@ -928,6 +930,7 @@ main( int argc, char **argv ) case oFastListMode: opt.fast_list_mode = 1; break; case oListOnly: opt.list_only=1; break; case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break; + case oIgnoreCrcError: opt.ignore_crc_error = 1; break; case oNoRandomSeedFile: use_random_seed = 0; break; case oNoAutoKeyRetrieve: opt.auto_key_retrieve = 0; break; case oShowSessionKey: opt.show_session_key = 1; break; diff --git a/g10/openfile.c b/g10/openfile.c index ff7478d86..460b4449e 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -329,7 +329,7 @@ try_make_homedir( const char *fname ) if ( ( *defhome == '~' && ( strlen(fname) >= strlen (defhome+1) - && !strcmp(fname+strlen(defhome+1)-strlen(defhome+1), + && !strcmp(fname+strlen(fname)-strlen(defhome+1), defhome+1 ) )) || ( *defhome != '~' && !compare_filenames( fname, defhome ) ) @@ -345,7 +345,3 @@ try_make_homedir( const char *fname ) g10_exit(1); } } - - - - diff --git a/g10/options.h b/g10/options.h index 18abd7ce4..40417159a 100644 --- a/g10/options.h +++ b/g10/options.h @@ -90,6 +90,7 @@ struct { int honor_http_proxy; int fast_list_mode; int ignore_time_conflict; + int ignore_crc_error; int command_fd; int auto_key_retrieve; const char *override_session_key; diff --git a/po/ChangeLog b/po/ChangeLog index f2f77085b..623cbc24f 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2000-10-19 Werner Koch + + Fixed a typo in all files. + 2000-10-16 Werner Koch * de.po, de.glo: Updated. diff --git a/po/da.po b/po/da.po index f0f785a22..a7127c613 100644 --- a/po/da.po +++ b/po/da.po @@ -2596,7 +2596,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" #: g10/parse-packet.c:119 diff --git a/po/de.po b/po/de.po index 7d027e26d..875a9e949 100644 --- a/po/de.po +++ b/po/de.po @@ -2703,7 +2703,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Experimentiermethoden sollten nicht benutzt werden!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "Diese Verschlüsselungsmethode taugt nicht mehr viel; verwenden Sie eine " "stärker standardisierte Methode!\n" diff --git a/po/eo.po b/po/eo.po index 0990e6c97..b1deeba86 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2663,7 +2663,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Eksperimentaj metodoj ne estu uzataj!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n" #: g10/parse-packet.c:119 diff --git a/po/es_ES.po b/po/es_ES.po index 6ac173dcb..e442ba64f 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -2694,7 +2694,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "¡No se deberían usar algoritmos experimentales!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "este algoritmo de cifrado está en desuso, considere el uso de uno más " "estándar.\n" diff --git a/po/fr.po b/po/fr.po index 947db4632..dd62244cc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2696,7 +2696,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "Cet algorithme de chiffrement est déconseillé; utilisez-en un\n" "plus standard !\n" diff --git a/po/id.po b/po/id.po index 78f6a395a..41242044d 100644 --- a/po/id.po +++ b/po/id.po @@ -2661,7 +2661,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n" diff --git a/po/it.po b/po/it.po index e797ebe16..f67a6881c 100644 --- a/po/it.po +++ b/po/it.po @@ -2678,7 +2678,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n" #: g10/parse-packet.c:119 diff --git a/po/ja.po b/po/ja.po index 125f74488..323da4a05 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2656,7 +2656,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£°ìÈÌŪ¤ÊÊýË¡¤òÍѤ¤¤Æ²¼¤µ¤¤!\n" #: g10/parse-packet.c:119 diff --git a/po/nl.po b/po/nl.po index 45168f417..316c2ffcd 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2698,7 +2698,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n" #: g10/parse-packet.c:119 diff --git a/po/pl.po b/po/pl.po index c8e444f2a..2c61d0ac6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2706,7 +2706,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "ten algorytm szyfruj±cy jest odradzany; proszê u¿ywaæ bardziej " "standardowych!\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0918b0ded..86a886544 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2704,7 +2704,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Algoritmos experimentais não devem ser usados!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "este algoritmo de criptografia é depreciado; por favor use algum\n" "algoritmo padrão!\n" diff --git a/po/pt_PT.po b/po/pt_PT.po index 4185f12d2..50f9a1192 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2698,7 +2698,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "Algoritmos experimentais não devem ser usados!\n" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "este algoritmo de criptografia não é recomendado;\n" "por favor use um algoritmo mais standard!\n" diff --git a/po/ru.po b/po/ru.po index b9446fa62..a64d167d8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2818,7 +2818,7 @@ msgid "Experimental algorithms should not be used!\n" msgstr "" #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" #: g10/parse-packet.c:119 diff --git a/po/sv.po b/po/sv.po index 942a751a9..f3695ccf6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2721,7 +2721,7 @@ msgstr "Experimentella algoritmer b # XXX #: g10/misc.c:234 -msgid "this cipher algorithm is depreciated; please use a more standard one!\n" +msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "" "avråder från denna chifferalgoritm, använd istället en mer normal algoritm!\n"