[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta442-50-g97f887a
by Werner Koch
cvs at cvs.gnupg.org
Thu Jul 3 11:54:29 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 97f887a0f5a7eba246dd68d860d3b6518de57daf (commit)
via 5ae34f574baca2b98a09fd982c941855558408e1 (commit)
via 980a5669a15b18e1ddb70d8be4ad804e26bf53de (commit)
via 5214d8f02bf65fb0a4af15ff80cf1369ccd4c167 (commit)
via 3533860ee316918dd47501c53e910bfd0032b39d (commit)
via b51af333bdf77c042c9fe748616e80d1f5e4d3f9 (commit)
via 8366503f0fb60af18504caf2ae7d53fdbed0911e (commit)
via 5f6b77afe8923f26ba2f23f6f6e440161bbd16f1 (commit)
from 03018ef9eec75e4d91ea53c95547a77dedef8f80 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 97f887a0f5a7eba246dd68d860d3b6518de57daf
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 14:33:34 2014 +0200
Post beta release update
--
diff --git a/NEWS b/NEWS
index 84d1741..2fcbaeb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.0-betaxxx (unreleased)
+--------------------------------------------------------
+
+
Noteworthy changes in version 2.1.0-beta751 (2014-07-03)
--------------------------------------------------------
commit 5ae34f574baca2b98a09fd982c941855558408e1
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 14:33:34 2014 +0200
Release 2.1.0-beta751
diff --git a/NEWS b/NEWS
index 0f2e78f..84d1741 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,34 @@
-Noteworthy changes in version 2.1.0 (unreleased)
-------------------------------------------------
+Noteworthy changes in version 2.1.0-beta751 (2014-07-03)
+--------------------------------------------------------
+
+ * gpg: Make export of secret keys work again.
+
+ * gpg: Create revocation certificates during key generation.
+
+ * gpg: Create exported secret keys and revocation certifciates with
+ mode 0700
+
+ * gpg: The output of --list-packets does now print the offset of the
+ packet and information about the packet header.
+
+ * gpg: Avoid DoS due to garbled compressed data packets. [CVE-2014-4617]
+
+ * gpg: Screen keyserver responses to avoid importing unwanted keys
+ from rogue servers.
+
+ * gpg: The validity of user ids is now shown by default. To revert
+ this add "list-options no-show-uid-validity" to gpg.conf.
+
+ * gpg: Print more specific reason codes with the INV_RECP status.
+
+ * gpg: Cap RSA and Elgamal keysize at 4096 bit also for unattended
+ key generation.
+
+ * scdaemon: Support reader Gemalto IDBridge CT30 and pinpad of SCT
+ cyberJack go.
+
+ * The speedo build system has been improved. It is now also possible
+ to build a partly working installer for Windows.
Noteworthy changes in version 2.1.0-beta442 (2014-06-05)
commit 980a5669a15b18e1ddb70d8be4ad804e26bf53de
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 14:33:34 2014 +0200
po: Auto-update
--
diff --git a/po/de.po b/po/de.po
index 6008229..7cdca4a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -671,9 +671,13 @@ msgstr "Ich werde sie später ändern"
msgid "Delete key"
msgstr "Schlüssel löschen"
+#, fuzzy
+#| msgid ""
+#| "Warning: This key is also listed for use with SSH!\n"
+#| "Deleting the key will may remove your ability to access remote machines."
msgid ""
"Warning: This key is also listed for use with SSH!\n"
-"Deleting the key will may remove your ability to access remote machines."
+"Deleting the key might remove your ability to access remote machines."
msgstr ""
"WARNUNG: Dieser Schlüssel wird auch für SSH benutzt!\n"
"Das Löschen dieses Schlüssels kann Ihren Zugriff auf entfernte Rechner\n"
@@ -4861,6 +4865,24 @@ msgstr "Widerrufzertifikat erzeugt.\n"
msgid "no revocation keys found for \"%s\"\n"
msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
+#, fuzzy
+#| msgid "Create a revocation certificate for this key? (y/N) "
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
+
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation."
+msgstr ""
+
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before making use of this revocation certificate."
+msgstr ""
+
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 1f06f43..8f28b50 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -675,7 +675,7 @@ msgstr "activer la clef"
msgid ""
"Warning: This key is also listed for use with SSH!\n"
-"Deleting the key will may remove your ability to access remote machines."
+"Deleting the key might remove your ability to access remote machines."
msgstr ""
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
@@ -4927,6 +4927,24 @@ msgstr "Certificat de révocation créé.\n"
msgid "no revocation keys found for \"%s\"\n"
msgstr "aucune clef de révocation trouvée pour « %s »\n"
+#, fuzzy
+#| msgid "Create a revocation certificate for this key? (y/N) "
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "Faut-il créer un certificat de révocation pour cette clef ? (o/N) "
+
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation."
+msgstr ""
+
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before making use of this revocation certificate."
+msgstr ""
+
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clef secrète « %s » introuvable : %s\n"
diff --git a/po/ja.po b/po/ja.po
index 6cfaf34..00949d9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -656,7 +656,7 @@ msgstr "鍵を有効にする"
msgid ""
"Warning: This key is also listed for use with SSH!\n"
-"Deleting the key will may remove your ability to access remote machines."
+"Deleting the key might remove your ability to access remote machines."
msgstr ""
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
@@ -4740,6 +4740,24 @@ msgstr "失効証明書を作成。\n"
msgid "no revocation keys found for \"%s\"\n"
msgstr "\"%s\"用の失効鍵が見つかりません\n"
+#, fuzzy
+#| msgid "Create a revocation certificate for this key? (y/N) "
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "この鍵にたいする失効証明書を作成しますか? (y/N) "
+
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation."
+msgstr ""
+
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before making use of this revocation certificate."
+msgstr ""
+
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 164d4b5..59407b6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -661,9 +661,13 @@ msgstr "Я зміню його пізніше"
msgid "Delete key"
msgstr "Вилучити ключ"
+#, fuzzy
+#| msgid ""
+#| "Warning: This key is also listed for use with SSH!\n"
+#| "Deleting the key will may remove your ability to access remote machines."
msgid ""
"Warning: This key is also listed for use with SSH!\n"
-"Deleting the key will may remove your ability to access remote machines."
+"Deleting the key might remove your ability to access remote machines."
msgstr ""
"Попередження: цей ключ є у списку використання для SSH!\n"
"Вилучення цього ключа може призвести до неможливості отримати доступ до "
@@ -4828,6 +4832,24 @@ msgstr "Створено сертифікат відкликання.\n"
msgid "no revocation keys found for \"%s\"\n"
msgstr "для «%s» не знайдено ключів відкликання\n"
+#, fuzzy
+#| msgid "Create a revocation certificate for this key? (y/N) "
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "Створити сертифікат відкликання для цього ключа? (y/N або т/Н) "
+
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation."
+msgstr ""
+
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before making use of this revocation certificate."
+msgstr ""
+
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "закритий ключ «%s» не знайдено: %s\n"
commit 5214d8f02bf65fb0a4af15ff80cf1369ccd4c167
Author: Werner Koch <wk at gnupg.org>
Date: Tue Jun 24 09:53:46 2014 +0200
gpg: Make show-uid-validity the default.
diff --git a/g10/gpg.c b/g10/gpg.c
index 3614201..da664be 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2085,9 +2085,11 @@ main (int argc, char **argv)
opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
opt.keyserver_options.options = (KEYSERVER_HONOR_KEYSERVER_URL
| KEYSERVER_HONOR_PKA_RECORD );
- opt.verify_options = (VERIFY_SHOW_POLICY_URLS
+ opt.verify_options = (LIST_SHOW_UID_VALIDITY
+ | VERIFY_SHOW_POLICY_URLS
| VERIFY_SHOW_STD_NOTATIONS
| VERIFY_SHOW_KEYSERVER_URLS);
+ opt.list_options = LIST_SHOW_UID_VALIDITY;
#ifdef NO_TRUST_MODELS
opt.trust_model = TM_ALWAYS;
#else
commit 3533860ee316918dd47501c53e910bfd0032b39d
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 14:33:34 2014 +0200
tests: Fix end-of-all-ticks test for Western locales.
* common/t-timestuff.c (test_timegm): Use timegm if available.
(main): Set TX to UTC if timegm is not available.
--
On OpenBSD 5.3 i386 that test failed due to the use of mktime.
Reported-by: Claus Assmann
diff --git a/common/t-timestuff.c b/common/t-timestuff.c
index ec55687..f39e308 100644
--- a/common/t-timestuff.c
+++ b/common/t-timestuff.c
@@ -112,7 +112,11 @@ test_timegm (void)
tbuf.tm_hour = tvalues[tidx].hour;
tbuf.tm_min = tvalues[tidx].min;
tbuf.tm_sec = tvalues[tidx].sec;
+#ifdef HAVE_TIMEGM
+ now = timegm (&tbuf);
+#else
now = mktime (&tbuf);
+#endif
}
if (now == (time_t)(-1))
fail (tidx);
@@ -122,7 +126,11 @@ test_timegm (void)
fail (tidx);
tbuf = *tp;
tbuf2 = tbuf;
+#ifdef HAVE_TIMEGM
atime = timegm (&tbuf);
+#else
+ atime = mktime (&tbuf);
+#endif
if (atime == (time_t)(-1))
fail (tidx);
if (atime != now)
@@ -146,6 +154,14 @@ main (int argc, char **argv)
(void)argc;
(void)argv;
+ /* If we do not have timegm, we use mktime. However, we need to use
+ UTC in this case so that the 20380118T235959 test does not fail
+ for other timezones. */
+#ifndef HAVE_TIMEGM
+ setenv ("TZ", "UTC", 1);
+ tzset ();
+#endif
+
test_timegm ();
return 0;
commit b51af333bdf77c042c9fe748616e80d1f5e4d3f9
Author: Kristian Fiskerstrand <kf at sumptuouscapital.com>
Date: Wed Jul 2 13:32:23 2014 +0200
gpg: Spelling error
diff --git a/agent/findkey.c b/agent/findkey.c
index b842f9e..8725afb 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -1257,7 +1257,7 @@ agent_delete_key (ctrl_t ctrl, const char *desc_text,
err = agent_get_confirmation
(ctrl,
_("Warning: This key is also listed for use with SSH!\n"
- "Deleting the key will may remove your ability to "
+ "Deleting the key might remove your ability to "
"access remote machines."),
_("Delete key"), _("No"), 0);
if (err)
commit 8366503f0fb60af18504caf2ae7d53fdbed0911e
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 14:33:34 2014 +0200
speedo: Update w32 installer
--
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 4d18d91..3c76c73 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -220,7 +220,7 @@ ReserveFile "${BUILD_DIR}\g4wihelp.dll"
#ReserveFile "${TOP_SRCDIR}\doc\logo\gnupg-logo-400px.bmp"
#ReserveFile "${W32_SRCDIR}\gnupg-splash.wav"
ReserveFile "${TOP_SRCDIR}\COPYING"
-ReserveFile "${BUILD_DIR}\inst-options.ini"
+ReserveFile "${W32_SRCDIR}\inst-options.ini"
#ReserveFile "${TOP_SRCDIR}\doc\logo\gnupg-logo-164x314.bmp"
# Language support
@@ -303,18 +303,18 @@ Function CustomPageOptions
!insertmacro MUI_HEADER_TEXT "$(T_InstallOptions)" "$(T_InstallOptLinks)"
# Note, that the default selection is done in the ini file
- !insertmacro MUI_INSTALLOPTIONS_WRITE "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "${W32_SRCDIR}/inst-options.ini" \
"Field 1" "Text" "$(T_InstOptLabelA)"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "${W32_SRCDIR}/inst-options.ini" \
"Field 2" "Text" "$(T_InstOptFieldA)"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "${W32_SRCDIR}/inst-options.ini" \
"Field 3" "Text" "$(T_InstOptFieldB)"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "${W32_SRCDIR}/inst-options.ini" \
"Field 4" "Text" "$(T_InstOptFieldC)"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "${W32_SRCDIR}/inst-options.ini" \
"Field 5" "Text" "$(T_InstOptLabelB)"
- !insertmacro MUI_INSTALLOPTIONS_DISPLAY "${BUILD_DIR}/inst-options.ini"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "${W32_SRCDIR}/inst-options.ini"
FunctionEnd
@@ -371,7 +371,7 @@ FunctionEnd
# Check whether the start menu is actually wanted.
Function CheckIfStartMenuWanted
- !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${W32_SRCDIR}/inst-options.ini" \
"Field 2" "State"
IntCmp $R0 1 +2
Abort
@@ -519,8 +519,8 @@ Section "-gnupginst"
# If we are reinstalling, try to kill a possible running gpa using
# an already installed gpa.
- ifFileExists "$INSTDIR\bin\gpa.exe" 0 no_uiserver
- ExecWait '"$INSTDIR\bin\gpa" --stop-server'
+ ifFileExists "$INSTDIR\bin\launch-gpa.exe" 0 no_uiserver
+ ExecWait '"$INSTDIR\bin\launch-gpa" --stop-server'
no_uiserver:
@@ -834,8 +834,8 @@ SectionEnd
#
Section "-un.gnupglast"
- ifFileExists "$INSTDIR\bin\gpa.exe" 0 no_uiserver
- ExecWait '"$INSTDIR\bin\gpa" --stop-server'
+ ifFileExists "$INSTDIR\bin\launch-gpa.exe" 0 no_uiserver
+ ExecWait '"$INSTDIR\bin\launch-gpa" --stop-server'
no_uiserver:
ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf
ExecWait '"$INSTDIR\bin\gpgconf" --kill gpg-agent'
@@ -1067,7 +1067,7 @@ Function .onInit
# We can't use TOP_SRCDIR dir as the name of the file needs to be
# the same while building and running the installer. Thus we
# generate the file from a template.
- !insertmacro MUI_INSTALLOPTIONS_EXTRACT "${BUILD_DIR}/inst-options.ini"
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "${W32_SRCDIR}/inst-options.ini"
#Call CalcDepends
FunctionEnd
@@ -1107,7 +1107,7 @@ Section "-startmenu"
SetShellVarContext all
# Check if the start menu entries where requested.
- !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${W32_SRCDIR}/inst-options.ini" \
"Field 2" "State"
IntCmp $R0 0 no_start_menu
@@ -1139,7 +1139,7 @@ no_start_menu:
# Check if the desktop entries where requested.
- !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${W32_SRCDIR}/inst-options.ini" \
"Field 3" "State"
IntCmp $R0 0 no_desktop
@@ -1160,7 +1160,7 @@ no_desktop:
# Check if the quick launch bar entries where requested.
- !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${BUILD_DIR}/inst-options.ini" \
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "${W32_SRCDIR}/inst-options.ini" \
"Field 4" "State"
IntCmp $R0 0 no_quick_launch
StrCmp $QUICKLAUNCH $TEMP no_quick_launch
commit 5f6b77afe8923f26ba2f23f6f6e440161bbd16f1
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jun 25 14:33:34 2014 +0200
doc: Add gnupg-logo.pdf
--
diff --git a/doc/gnupg-logo.pdf b/doc/gnupg-logo.pdf
new file mode 100644
index 0000000..a2aab4a
Binary files /dev/null and b/doc/gnupg-logo.pdf differ
-----------------------------------------------------------------------
Summary of changes:
NEWS | 37 +++++++++++++++++++++++++++++++++++--
agent/findkey.c | 2 +-
build-aux/speedo/w32/inst.nsi | 32 ++++++++++++++++----------------
common/t-timestuff.c | 16 ++++++++++++++++
doc/gnupg-logo.pdf | Bin 0 -> 13838 bytes
g10/gpg.c | 4 +++-
po/de.po | 24 +++++++++++++++++++++++-
po/fr.po | 20 +++++++++++++++++++-
po/ja.po | 20 +++++++++++++++++++-
po/uk.po | 24 +++++++++++++++++++++++-
10 files changed, 155 insertions(+), 24 deletions(-)
create mode 100644 doc/gnupg-logo.pdf
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list