mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
Preparing 2.0.7
This commit is contained in:
Werner Koch
parent
7f033b2a88
commit
782e1bc00b
@ -1,3 +1,7 @@
|
||||
2007-09-10 Werner Koch <wk@g10code.com>
|
||||
|
||||
Released 2.0.7.
|
||||
|
||||
2007-08-27 Werner Koch <wk@g10code.com>
|
||||
|
||||
* configure.ac: Remove remaining support for internal regex.
|
||||
|
||||
2
NEWS
2
NEWS
@ -1,4 +1,4 @@
|
||||
Noteworthy changes in version 2.0.7
|
||||
Noteworthy changes in version 2.0.7 (2007-09-10)
|
||||
------------------------------------------------
|
||||
|
||||
* Fixed encryption problem if duplicate certificates are in the
|
||||
|
||||
@ -30,8 +30,8 @@ Release process:
|
||||
* Run "./autogen.sh --force"
|
||||
(--force is required for the svn magic in configure.ac and a good
|
||||
idea in any case)
|
||||
* Run configure as usual.
|
||||
* Run "make distcheck"
|
||||
* Run "configure --enable-maintainer-mode".
|
||||
* Run "make distcheck".
|
||||
* Build and test the new tarball (best on a different machine).
|
||||
* Build and test the W32 version.
|
||||
* Using the final test build run a "make -C doc online".
|
||||
|
||||
2
TODO
2
TODO
@ -125,7 +125,7 @@
|
||||
* Howtos
|
||||
** Migrate OpenPGP keys to another system
|
||||
|
||||
* Duplicate certifciates
|
||||
* Duplicate certificates
|
||||
This may happen and lead to an Ambiguous Name error. Solution is to
|
||||
check the certs for identity before throwing this error.
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ min_automake_version="1.10"
|
||||
# Set my_issvn to "yes" for non-released code. Remember to run an
|
||||
# "svn up" and "autogen.sh" right before creating a distribution.
|
||||
m4_define([my_version], [2.0.7])
|
||||
m4_define([my_issvn], [yes])
|
||||
m4_define([my_issvn], [no])
|
||||
|
||||
|
||||
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
|
||||
|
||||
6
po/be.po
6
po/be.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.2.2\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2003-10-30 16:35+0200\n"
|
||||
"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
|
||||
"Language-Team: Belarusian <i18n@mova.org>\n"
|
||||
@ -664,7 +664,7 @@ msgstr "дрэнны пароль"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "памылка стварэньня \"%s\": %s\n"
|
||||
@ -7545,7 +7545,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/ca.po
6
po/ca.po
@ -27,7 +27,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.4.0\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2005-02-04 02:04+0100\n"
|
||||
"Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
|
||||
"Language-Team: Catalan <ca@dodds.net>\n"
|
||||
@ -700,7 +700,7 @@ msgstr "canvia la contrasenya"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "error en la creació de la contrasenya: %s\n"
|
||||
@ -8134,7 +8134,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/cs.po
6
po/cs.po
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-1.3.92\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-11-26 09:12+0200\n"
|
||||
"Last-Translator: Roman Pavlik <rp@tns.cz>\n"
|
||||
"Language-Team: Czech <translations.cs@gnupg.cz>\n"
|
||||
@ -676,7 +676,7 @@ msgstr "zm
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "chyba pøi vytváøení hesla: %s\n"
|
||||
@ -7815,7 +7815,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/da.po
6
po/da.po
@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.0.0h\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2003-12-03 16:11+0100\n"
|
||||
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
|
||||
"Language-Team: Danish <dansk@klid.dk>\n"
|
||||
@ -669,7 +669,7 @@ msgstr "
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "fejl ved oprettelse af kodesætning: %s\n"
|
||||
@ -7700,7 +7700,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/de.po
6
po/de.po
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-2.0.6\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2007-08-29 18:51+0200\n"
|
||||
"Last-Translator: Walter Koch <koch@u32.de>\n"
|
||||
"Language-Team: German <de@li.org>\n"
|
||||
@ -688,7 +688,7 @@ msgstr "Die Passphrase ändern"
|
||||
msgid "I'll change it later"
|
||||
msgstr "Ich werde sie später ändern"
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
|
||||
@ -7907,7 +7907,7 @@ msgstr "Konfiguration der zu nutzenden LDAP-Server"
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr "Konfiguration zu OCSP"
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
|
||||
|
||||
|
||||
6
po/el.po
6
po/el.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-1.1.92\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2003-06-27 12:00+0200\n"
|
||||
"Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
|
||||
"Language-Team: Greek <nls@tux.hellug.gr>\n"
|
||||
@ -674,7 +674,7 @@ msgstr "
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
|
||||
@ -7988,7 +7988,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/eo.po
6
po/eo.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.0.6d\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2002-04-14 14:33+0100\n"
|
||||
"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
|
||||
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
|
||||
@ -674,7 +674,7 @@ msgstr "
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "eraro dum kreado de pasfrazo: %s\n"
|
||||
@ -7934,7 +7934,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/es.po
6
po/es.po
@ -10,7 +10,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.4.1\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
|
||||
"Last-Translator: Jaime Suárez <jsuarez@ono.com>\n"
|
||||
"Language-Team: Spanish <es@li.org>\n"
|
||||
@ -705,7 +705,7 @@ msgstr "cambia la frase contrase
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "error creando frase contraseña: %s\n"
|
||||
@ -7862,7 +7862,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/et.po
6
po/et.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.2.2\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-06-17 11:04+0300\n"
|
||||
"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
|
||||
"Language-Team: Estonian <et@li.org>\n"
|
||||
@ -673,7 +673,7 @@ msgstr "muuda parooli"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "viga parooli loomisel: %s\n"
|
||||
@ -7893,7 +7893,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/fi.po
6
po/fi.po
@ -22,7 +22,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.2.2\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-06-16 22:40+0300\n"
|
||||
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
|
||||
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
|
||||
@ -690,7 +690,7 @@ msgstr "muuta salasanaa"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "virhe luotaessa salasanaa: %s\n"
|
||||
@ -7972,7 +7972,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/fr.po
6
po/fr.po
@ -11,7 +11,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.4.2rc2\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2005-06-28 00:24+0200\n"
|
||||
"Last-Translator: Gaël Quéri <gael@lautre.net>\n"
|
||||
"Language-Team: French <traduc@traduc.org>\n"
|
||||
@ -690,7 +690,7 @@ msgstr "changer la phrase de passe"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "erreur pendant la création de la phrase de passe: %s\n"
|
||||
@ -8019,7 +8019,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/gl.po
6
po/gl.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.2.4\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2003-12-04 11:39+0100\n"
|
||||
"Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
|
||||
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
|
||||
@ -678,7 +678,7 @@ msgstr "cambia-lo contrasinal"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "erro ao crea-lo contrasinal: %s\n"
|
||||
@ -7983,7 +7983,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/hu.po
6
po/hu.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.2.5\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-06-19 21:53+0200\n"
|
||||
"Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
|
||||
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
|
||||
@ -673,7 +673,7 @@ msgstr "jelsz
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "Hiba a jelszó létrehozásakor: %s.\n"
|
||||
@ -7934,7 +7934,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/id.po
6
po/id.po
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-id\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-06-17 16:32+0700\n"
|
||||
"Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
|
||||
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
|
||||
@ -675,7 +675,7 @@ msgstr "ubah passphrase"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "kesalahan penciptaan passphrase: %s\n"
|
||||
@ -7936,7 +7936,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/it.po
6
po/it.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.1.92\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-06-16 17:01+0200\n"
|
||||
"Last-Translator: Marco d'Itri <md@linux.it>\n"
|
||||
"Language-Team: Italian <tp@lists.linux.it>\n"
|
||||
@ -673,7 +673,7 @@ msgstr "cambia la passphrase"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "errore nella creazione della passhprase: %s\n"
|
||||
@ -7982,7 +7982,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/ja.po
6
po/ja.po
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.3.92\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-11-23 11:14+0900\n"
|
||||
"Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
|
||||
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
|
||||
@ -676,7 +676,7 @@ msgstr "
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "パスフレーズの作成エラー: %s\n"
|
||||
@ -7749,7 +7749,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/nb.po
6
po/nb.po
@ -10,7 +10,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.4.3\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2006-06-13 20:31+0200\n"
|
||||
"Last-Translator: Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no>\n"
|
||||
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
|
||||
@ -671,7 +671,7 @@ msgstr "endre passfrasen"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "feil ved opprettelse av passfrase: %s\n"
|
||||
@ -7618,7 +7618,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/pl.po
6
po/pl.po
@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg-1.2.2\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-06-23 15:54+0200\n"
|
||||
"Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
|
||||
"Language-Team: Polish <pl@li.org>\n"
|
||||
@ -684,7 +684,7 @@ msgstr "zmiana has
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "b³±d podczas tworzenia has³a: %s\n"
|
||||
@ -7979,7 +7979,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/pt.po
6
po/pt.po
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2002-09-13 18:26+0100\n"
|
||||
"Last-Translator: Pedro Morais <morais@kde.org>\n"
|
||||
"Language-Team: pt <morais@kde.org>\n"
|
||||
@ -677,7 +677,7 @@ msgstr "muda a frase secreta"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "erro na criação da frase secreta: %s\n"
|
||||
@ -7950,7 +7950,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.0\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2007-08-16 11:35+0200\n"
|
||||
"Last-Translator:\n"
|
||||
"Language-Team: ?\n"
|
||||
@ -678,7 +678,7 @@ msgstr "muda a frase secreta"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "erro na criação da frase secreta: %s\n"
|
||||
@ -7902,7 +7902,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/ro.po
6
po/ro.po
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.4.2rc1\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2005-05-31 22:00-0500\n"
|
||||
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
|
||||
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
|
||||
@ -682,7 +682,7 @@ msgstr "schimb
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "eroare la crearea frazei-parolã: %s\n"
|
||||
@ -7843,7 +7843,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/ru.po
6
po/ru.po
@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: GnuPG 2.0.0\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2006-11-07 19:31+0300\n"
|
||||
"Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
|
||||
"Language-Team: Russian <gnupg-ru@gnupg.org>\n"
|
||||
@ -660,7 +660,7 @@ msgstr "сменить фразу-пароль"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr ""
|
||||
@ -7703,7 +7703,7 @@ msgstr "Настройки LDAP серверов"
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr "Настройки OCSP"
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/sk.po
6
po/sk.po
@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.2.5\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2004-07-20 15:52+0200\n"
|
||||
"Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
|
||||
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
|
||||
@ -674,7 +674,7 @@ msgstr "zmeni
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "chyba pri vytváraní hesla: %s\n"
|
||||
@ -7954,7 +7954,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/sv.po
6
po/sv.po
@ -24,7 +24,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 2.0\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2007-02-17 13:13+0100\n"
|
||||
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
|
||||
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
||||
@ -695,7 +695,7 @@ msgstr "ändra en lösenfras"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "fel när ett rör skapades: %s\n"
|
||||
@ -7916,7 +7916,7 @@ msgstr "Konfiguration av LDAP-servrar som ska användas"
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr "Konfiguration för OCSP"
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
6
po/tr.po
6
po/tr.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.9.94\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2006-11-04 03:45+0200\n"
|
||||
"Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
|
||||
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
|
||||
@ -665,7 +665,7 @@ msgstr "anahtar parolası değiştirir"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "boru oluşturulurken hata: %s\n"
|
||||
@ -7791,7 +7791,7 @@ msgstr "Kullanılacak LDAP sunucularının yapılandırması"
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr "OCSP için yapılandırma"
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.4.4\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
|
||||
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
|
||||
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
|
||||
@ -680,7 +680,7 @@ msgstr "更改密码"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "生成密码的时候发生错误：%s\n"
|
||||
@ -7651,7 +7651,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gnupg 1.4.2\n"
|
||||
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
|
||||
"POT-Creation-Date: 2007-08-29 18:43+0200\n"
|
||||
"POT-Creation-Date: 2007-09-10 17:28+0200\n"
|
||||
"PO-Revision-Date: 2005-07-29 09:49+0800\n"
|
||||
"Last-Translator: Jedi <Jedi@Jedi.org>\n"
|
||||
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
|
||||
@ -676,7 +676,7 @@ msgstr "更改密語"
|
||||
msgid "I'll change it later"
|
||||
msgstr ""
|
||||
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313
|
||||
#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340
|
||||
#, fuzzy, c-format
|
||||
msgid "error creating a pipe: %s\n"
|
||||
msgstr "建立密語的時候發生錯誤: %s\n"
|
||||
@ -7691,7 +7691,7 @@ msgstr ""
|
||||
msgid "Configuration for OCSP"
|
||||
msgstr ""
|
||||
|
||||
#: tools/gpgconf-comp.c:2955
|
||||
#: tools/gpgconf-comp.c:2982
|
||||
msgid "Note that group specifications are ignored\n"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -9,6 +9,8 @@
|
||||
|
||||
2007-08-31 Werner Koch <wk@g10code.com>
|
||||
|
||||
* gpgparsemail.c: Support PGP/MIME signed messages.
|
||||
|
||||
* gpgconf-comp.c (gc_component_list_components): List the programs
|
||||
names.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* gpgparsemail.c - Standalone crypto mail parser
|
||||
* Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
* Copyright (C) 2004, 2007 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
@ -64,7 +64,9 @@ struct parse_info_s {
|
||||
|
||||
int is_pkcs7; /* Old style S/MIME message. */
|
||||
|
||||
int gpgsm_mime; /* gpgsm shall be used from S/MIME. */
|
||||
int moss_state; /* State of PGP/MIME or S/MIME parsing. */
|
||||
int is_smime; /* This is S/MIME and not PGP/MIME. */
|
||||
|
||||
char *signing_protocol;
|
||||
int hashing_level; /* The nesting level we are hashing. */
|
||||
int hashing;
|
||||
@ -167,7 +169,6 @@ run_gnupg (int smime, int sig_fd, int data_fd, int *close_list)
|
||||
int i, c, is_status;
|
||||
unsigned int pos;
|
||||
char status_buf[10];
|
||||
const char *cmd = smime? "gpgsm":"gpg";
|
||||
FILE *fp;
|
||||
|
||||
if (pipe (rp) == -1)
|
||||
@ -218,14 +219,24 @@ run_gnupg (int smime, int sig_fd, int data_fd, int *close_list)
|
||||
close (fd);
|
||||
errno = 0;
|
||||
|
||||
execlp (cmd, cmd,
|
||||
"--enable-special-filenames",
|
||||
"--status-fd", "2",
|
||||
"--assume-base64",
|
||||
"--verify",
|
||||
"--",
|
||||
"-", data_fd == -1? NULL : data_fd_buf,
|
||||
NULL);
|
||||
if (smime)
|
||||
execlp ("gpgsm", "gpgsm",
|
||||
"--enable-special-filenames",
|
||||
"--status-fd", "2",
|
||||
"--assume-base64",
|
||||
"--verify",
|
||||
"--",
|
||||
"-", data_fd == -1? NULL : data_fd_buf,
|
||||
NULL);
|
||||
else
|
||||
execlp ("gpg", "gpg",
|
||||
"--enable-special-filenames",
|
||||
"--status-fd", "2",
|
||||
"--verify",
|
||||
"--debug=512",
|
||||
"--",
|
||||
"-", data_fd == -1? NULL : data_fd_buf,
|
||||
NULL);
|
||||
|
||||
die ("failed to exec the crypto command: %s", strerror (errno));
|
||||
}
|
||||
@ -323,7 +334,7 @@ verify_signature (struct parse_info_s *info)
|
||||
/* rewind (info->sig_file); */
|
||||
|
||||
close_list[0] = -1;
|
||||
run_gnupg (1, fileno (info->sig_file),
|
||||
run_gnupg (info->is_smime, fileno (info->sig_file),
|
||||
info->hash_file ? fileno (info->hash_file) : -1, close_list);
|
||||
}
|
||||
|
||||
@ -342,14 +353,27 @@ mime_signed_begin (struct parse_info_s *info, rfc822parse_t msg,
|
||||
if (s)
|
||||
{
|
||||
printf ("h signed.protocol: %s\n", s);
|
||||
if (!strcmp (s, "application/pkcs7-signature")
|
||||
|| !strcmp (s, "application/x-pkcs7-signature"))
|
||||
if (!strcmp (s, "application/pgp-signature"))
|
||||
{
|
||||
if (info->gpgsm_mime)
|
||||
err ("note: ignoring nested pkcs7-signature");
|
||||
if (info->moss_state)
|
||||
err ("note: ignoring nested PGP/MIME or S/MIME signature");
|
||||
else
|
||||
{
|
||||
info->gpgsm_mime = 1;
|
||||
info->moss_state = 1;
|
||||
info->is_smime = 0;
|
||||
free (info->signing_protocol);
|
||||
info->signing_protocol = xstrdup (s);
|
||||
}
|
||||
}
|
||||
else if (!strcmp (s, "application/pkcs7-signature")
|
||||
|| !strcmp (s, "application/x-pkcs7-signature"))
|
||||
{
|
||||
if (info->moss_state)
|
||||
err ("note: ignoring nested PGP/MIME or S/MIME signature");
|
||||
else
|
||||
{
|
||||
info->moss_state = 1;
|
||||
info->is_smime = 1;
|
||||
free (info->signing_protocol);
|
||||
info->signing_protocol = xstrdup (s);
|
||||
}
|
||||
@ -435,6 +459,30 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg)
|
||||
|
||||
if (debug)
|
||||
show_event (event);
|
||||
|
||||
if (event == RFC822PARSE_BEGIN_HEADER || event == RFC822PARSE_T2BODY)
|
||||
{
|
||||
/* We need to check here whether to start collecting signed data
|
||||
because attachments might come without header lines and thus
|
||||
we won't see the BEGIN_HEADER event. */
|
||||
if (info->moss_state == 1)
|
||||
{
|
||||
printf ("c begin_hash\n");
|
||||
info->hashing = 1;
|
||||
info->hashing_level = info->nesting_level;
|
||||
info->moss_state++;
|
||||
|
||||
if (opt_crypto)
|
||||
{
|
||||
assert (!info->hash_file);
|
||||
info->hash_file = tmpfile ();
|
||||
if (!info->hash_file)
|
||||
die ("failed to create temporary file: %s", strerror (errno));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (event == RFC822PARSE_OPEN)
|
||||
{
|
||||
/* Initialize for a new message. */
|
||||
@ -453,18 +501,19 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg)
|
||||
{
|
||||
printf ("h media: %*s%s %s\n",
|
||||
info->nesting_level*2, "", s1, s2);
|
||||
if (info->gpgsm_mime == 3)
|
||||
if (info->moss_state == 3)
|
||||
{
|
||||
char *buf = xmalloc (strlen (s1) + strlen (s2) + 2);
|
||||
strcpy (stpcpy (stpcpy (buf, s1), "/"), s2);
|
||||
assert (info->signing_protocol);
|
||||
if (strcmp (buf, info->signing_protocol))
|
||||
err ("invalid S/MIME structure; expected `%s', found `%s'",
|
||||
err ("invalid %s structure; expected `%s', found `%s'",
|
||||
info->is_smime? "S/MIME":"PGP/MIME",
|
||||
info->signing_protocol, buf);
|
||||
else
|
||||
{
|
||||
printf ("c begin_signature\n");
|
||||
info->gpgsm_mime++;
|
||||
info->moss_state++;
|
||||
if (opt_crypto)
|
||||
{
|
||||
assert (!info->sig_file);
|
||||
@ -496,6 +545,8 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg)
|
||||
else
|
||||
printf ("h media: %*stext plain [assumed]\n",
|
||||
info->nesting_level*2, "");
|
||||
|
||||
|
||||
info->show_header = 0;
|
||||
info->show_data = 1;
|
||||
info->skip_show = 1;
|
||||
@ -528,36 +579,18 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg)
|
||||
else
|
||||
printf ("b last\n");
|
||||
|
||||
if (info->gpgsm_mime == 2 && info->nesting_level == info->hashing_level)
|
||||
if (info->moss_state == 2 && info->nesting_level == info->hashing_level)
|
||||
{
|
||||
printf ("c end_hash\n");
|
||||
info->gpgsm_mime++;
|
||||
info->moss_state++;
|
||||
info->hashing = 0;
|
||||
}
|
||||
else if (info->gpgsm_mime == 4)
|
||||
else if (info->moss_state == 4)
|
||||
{
|
||||
printf ("c end_signature\n");
|
||||
info->verify_now = 1;
|
||||
}
|
||||
}
|
||||
else if (event == RFC822PARSE_BEGIN_HEADER)
|
||||
{
|
||||
if (info->gpgsm_mime == 1)
|
||||
{
|
||||
printf ("c begin_hash\n");
|
||||
info->hashing = 1;
|
||||
info->hashing_level = info->nesting_level;
|
||||
info->gpgsm_mime++;
|
||||
|
||||
if (opt_crypto)
|
||||
{
|
||||
assert (!info->hash_file);
|
||||
info->hash_file = tmpfile ();
|
||||
if (!info->hash_file)
|
||||
die ("failed to create temporary file: %s", strerror (errno));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -634,7 +667,8 @@ parse_message (FILE *fp)
|
||||
info.hash_file = NULL;
|
||||
fclose (info.sig_file);
|
||||
info.sig_file = NULL;
|
||||
info.gpgsm_mime = 0;
|
||||
info.moss_state = 0;
|
||||
info.is_smime = 0;
|
||||
info.is_pkcs7 = 0;
|
||||
}
|
||||
else
|
||||
@ -760,6 +794,6 @@ main (int argc, char **argv)
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
compile-command: "gcc -Wall -g -o gpgparsemail rfc822parse.c gpgparsemail.c"
|
||||
compile-command: "gcc -Wall -Wno-pointer-sign -g -o gpgparsemail rfc822parse.c gpgparsemail.c"
|
||||
End:
|
||||
*/
|
||||
|
||||
@ -1251,6 +1251,6 @@ main (int argc, char **argv)
|
||||
|
||||
/*
|
||||
Local Variables:
|
||||
compile-command: "gcc -Wall -g -DTESTING -o rfc822parse rfc822parse.c"
|
||||
compile-command: "gcc -Wall -Wno-pointer-sign -g -DTESTING -o rfc822parse rfc822parse.c"
|
||||
End:
|
||||
*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user