[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-174-g604c130

by Werner Koch cvs at cvs.gnupg.org
Tue Dec 20 18:02:00 CET 2011


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  604c130a85d4203b9d84137a42673aeaff1c0bd1 (commit)
       via  8e47f1e576f70d4dbe966523057fe3078006ae8b (commit)
       via  6f02c143440865781b4e3c1753e24e55a0de40e4 (commit)
       via  fe2f1826991e8130f727ee15df1a4651f679752f (commit)
       via  779611494dbd187d09b05d2eb10faabd31a70156 (commit)
       via  366512abe44d9e71bb2c699c29477afa6ac71cdd (commit)
      from  07f20f313a0b13e5c93168a8a62ff1cbb94a4514 (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 604c130a85d4203b9d84137a42673aeaff1c0bd1
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 16:46:18 2011 +0100

    Release 2.1.0beta3.

commit 8e47f1e576f70d4dbe966523057fe3078006ae8b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 15:55:43 2011 +0100

    Prepare for the beta3 release.

diff --git a/NEWS b/NEWS
index 4364405..7d77406 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.1.0beta3
+Noteworthy changes in version 2.1.0beta3 (2011-12-20)
 -----------------------------------------------------
 
  * Fixed regression in GPG's secret key export function.
@@ -15,7 +15,7 @@ Noteworthy changes in version 2.1.0beta3
  * gpg-connect-agent does now proberly display the help output for
    "SCD HELP" commands.
 
- * New GPGSM validation model "steed".
+ * Preliminary support for the GPGSM validation model "steed".
 
  * Improved certificate creation in GPGSM.
 
diff --git a/README.maint b/README.maint
index f390afc..bdcdbf9 100644
--- a/README.maint
+++ b/README.maint
@@ -27,8 +27,8 @@ Release process:
   * Run "make -C po update-po".
   * Write NEWS entries and set the release date in NEWS.
   * In configure.ac set "my_issvn" to "no".
-  * Put a "Release <version>" line into the top level ChangeLog.
   * Commit all changes to GIT and push them.
+  * Do a commit with a "Release <version>" line.
   * Run "./autogen.sh --force"
     (--force is required for the svn magic in configure.ac and a good
     idea in any case)
diff --git a/configure.ac b/configure.ac
index 9dd555e..b3c7678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # 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.1.0])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [2.1.0beta3])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
diff --git a/doc/HACKING b/doc/HACKING
index d6cb8ab..0ef5b89 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -23,7 +23,8 @@ and ChangeLog entries don't give enough of the big picture.  Omit the
 leading TABs that you're used to seeing in a "real" ChangeLog file, but
 keep the maximum line length at 72 or smaller, so that the generated
 ChangeLog lines, each with its leading TAB, will not exceed 80 columns.
-
+If you want to add text which shall not be copied to the ChangeLog,
+separate it by a line consisting of two dashes at the begin of a line.
 
 
 ===> What follows is probably out of date <===
@@ -39,15 +40,17 @@ RFCs
 
 1750  Randomness Recommendations for Security.
 
-1991  PGP Message Exchange Formats.
-
-2015  MIME Security with Pretty Good Privacy (PGP).
+1991  PGP Message Exchange Formats (obsolete)
 
 2144  The CAST-128 Encryption Algorithm.
 
 2279  UTF-8, a transformation format of ISO 10646.
 
-2440  OpenPGP.
+2440  OpenPGP (obsolete).
+
+3156  MIME Security with Pretty Good Privacy (PGP).
+
+4880  Current OpenPGP specification.
 
 
 

commit 6f02c143440865781b4e3c1753e24e55a0de40e4
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 15:54:43 2011 +0100

    po: Update the German translation.

diff --git a/po/de.po b/po/de.po
index fe83f79..8b98258 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2011-11-24 14:15+0100\n"
+"PO-Revision-Date: 2011-12-20 15:52+0100\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: German <de at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -111,9 +111,9 @@ msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
 msgid "detected card with S/N: %s\n"
 msgstr "Erkannte Karte hat die Seriennummer: %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "no authentication key for ssh on card: %s\n"
-msgstr "Fehler beim Holen der Authentisierungsschlüssel-ID der Karte: %s\n"
+msgstr "Auf der Karte ist kein Authentisierungsschlüssel für SSH: %s\n"
 
 #, c-format
 msgid "no suitable card key found: %s\n"
@@ -5434,17 +5434,11 @@ msgstr "|AN|Neue Admin-PIN"
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#, fuzzy
-msgid "||Please enter the Reset Code for the card and New PIN"
-msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
-
-#, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
-msgstr "|A|Bitte die Admin-PIN eingeben."
+msgstr "|A|Bitte die Admin-PIN sowie die neue Admin-PIN eingeben."
 
-#, fuzzy
 msgid "||Please enter the PIN and New PIN"
-msgstr "||Bitte die PIN eingeben"
+msgstr "||Bitte die PIN sowie die neue PIN eingeben"
 
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
@@ -5881,6 +5875,18 @@ msgid "line %d: invalid hash algorithm given\n"
 msgstr "Zeile %d: Ungültiges Hashverfahren\n"
 
 #, c-format
+msgid "line %d: invalid authority-key-id\n"
+msgstr "Zeile %d: Ungültige Authentisierungsschlüssel-ID\n"
+
+#, c-format
+msgid "line %d: invalid subject-key-id\n"
+msgstr "Zeile %d: ungültige \"Subject-Key-Id\"\n"
+
+#, c-format
+msgid "line %d: invalid extension syntax\n"
+msgstr "Zeile %d: Ungültiger Syntax der Extension\n"
+
+#, c-format
 msgid "line %d: error reading key `%s' from card: %s\n"
 msgstr "Zeile %d: Fehler beim Lesen des Schlüssels `%s' von der Karte: %s\n"
 
@@ -7925,6 +7931,10 @@ msgstr ""
 "Syntax: gpg-check-pattern [optionen] Musterdatei\n"
 "Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
 
+#, fuzzy
+#~ msgid "||Please enter the Reset Code for the card and New PIN"
+#~ msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
+
 #~ msgid " - probably dead - removing lock"
 #~ msgstr " - existiert wahrscheinlich nicht mehr - entferne Sperre"
 

commit fe2f1826991e8130f727ee15df1a4651f679752f
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 15:35:42 2011 +0100

    Add the STEED Self-Signing Nonthority certificate.
    
    * doc/com-certs.pem: Install it when creating a keybox.

diff --git a/doc/com-certs.pem b/doc/com-certs.pem
index 43e93b7..b3d5fa2 100644
--- a/doc/com-certs.pem
+++ b/doc/com-certs.pem
@@ -482,3 +482,21 @@ G1RRiCiWgYaEtSIDAP0V9ehpcghfJLlmMBnxSf4n7OZvkd1whvme2rXaQxnZi2qV
 d2qclY03eJ7zx6Zpq8VFuVvOxvmFZ4mMe706runhCq+rHc5x6x0/oIMhDrk=
 -----END CERTIFICATE-----
 
+Issuer ...: /CN=The STEED Self-Signing Nonthority
+Serial ...: 01
+Subject ..: /CN=The STEED Self-Signing Nonthority
+
+-----BEGIN CERTIFICATE-----
+MIICKDCCAZGgAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDEyFUaGUg
+U1RFRUQgU2VsZi1TaWduaW5nIE5vbnRob3JpdHkwIBcNMTExMTExMDAwMDAwWhgP
+MjEwNjAyMDYwMDAwMDBaMCwxKjAoBgNVBAMTIVRoZSBTVEVFRCBTZWxmLVNpZ25p
+bmcgTm9udGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAk2h9kqe8
+0eb8ESY7UGV6j6S5zuP5DiM4TWJ3jKG2y+D2CyA1Sl90iZ6zyN3zCB0yR1xxhpuw
+xdrwBRovRFludAbx3MeynYhzXkk0Hwn038q1oIt2YUw3Igz34s24o455ZE86JQ/6
+5dC7ppF8Z1I9KBL96NO+qZR/alVAKxYAwS8CAwEAAaNYMFYwEgYDVR0TAQH/BAgw
+BgEB/wIBATARBgorBgEEAdpHAgICBAMBAf8wHQYDVR0OBBYEFGimOJmN+rrFEOpk
+XONPloay7ffqMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOBgQB3JwUn
+AbOdGv5ErojNSSP+yGZIy5av4wnkzK840Uj3jY6A5cuHroZGOD60hqLV2Hy0npox
+zte4phWEKWmZiXd8SCmd3MFNgZSieiixye0qxSmuqYft2j6NhEXD5xc/iTTjFT42
+SjGPLKAICuMBuGPnoozOEVlgqwaDqKOUph5sqw==
+-----END CERTIFICATE-----
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2142d33..307d829 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,6 +41,8 @@ EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \
 	     text-1.txt text-2.txt text-3.txt \
 	     text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
 	     text-2.osig.pem text-2.osig-bad.pem \
+	     samplekeys/steed-self-signing-nonthority.pem \
+	     samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
              samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
              samplekeys/cert_g10code_pete1.pem \
              samplekeys/cert_g10code_test1.pem \
diff --git a/tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key b/tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
new file mode 100644
index 0000000..8236349
--- /dev/null
+++ b/tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
@@ -0,0 +1,10 @@
+(private-key
+ (rsa
+  (n #0093687D92A7BCD1E6FC11263B50657A8FA4B9CEE3F90E23384D62778CA1B6CBE0F60B20354A5F74899EB3C8DDF3081D32475C71869BB0C5DAF0051A2F44596E7406F1DCC7B29D88735E49341F09F4DFCAB5A08B76614C37220CF7E2CDB8A38E79644F3A250FFAE5D0BBA6917C67523D2812FDE8D3BEA9947F6A55402B1600C12F#)
+  (e #010001#)
+  (d #11BAAE926B54482C04EDE1C59E877B5F382114F8D1BAAE926B54482C04EDE1C59E877B5F382114F8D1BAAE926B54482C04EDE1C59E877B5F382114F8D1BAAE905D3988DFC39FEF462A0655AC906CBC12F6D322795D3988DFC39FEF462A0655AC906CBC12F6D322795D3988DFC39FEF462A0655AC906CBC12F6D322795D3983C1#)
+  (p "\x00ÂBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBAÏ")
+  (q "\x00ÂBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB¡")
+  (u #00B28879D8EEE03F5546A5BBAD0C2213728879D8EEE03F5546A5BBAD0C2213728879D8EEE03F5546A5BBAD0C2213728879D8EEE03F5546A5BBAD0C221372887A30#)
+  )
+ )
diff --git a/tests/samplekeys/README b/tests/samplekeys/README
index a71f798..65255cb 100644
--- a/tests/samplekeys/README
+++ b/tests/samplekeys/README
@@ -1,6 +1,6 @@
 This is a collection of keys we use with the regression tests.
 
-opensc-tests.p12   PKCS#12 key and certificates taken from OpenSC. 
+opensc-tests.p12   PKCS#12 key and certificates taken from OpenSC.
 		   Passphrase is "password"
 
 ov-user.p12        Private tests keys from www.openvalidation.org.
@@ -17,5 +17,8 @@ gte.pem            GTE CyberTrust Global Root
 
 cert-with-117-akas.pem  A certificate with 117 subjectAltNames.
 
+steed-self-signing-nonthority.pem
+                   The STEED Self-Signing Nonthority.
+68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
+                   The private Key of The STEED Self-Signing Nonthority.
 
-		  
diff --git a/tests/samplekeys/steed-self-signing-nonthority.pem b/tests/samplekeys/steed-self-signing-nonthority.pem
new file mode 100644
index 0000000..c6a9c54
--- /dev/null
+++ b/tests/samplekeys/steed-self-signing-nonthority.pem
@@ -0,0 +1,54 @@
+
+           ID: 0x72B0BD08
+          S/N: 01
+       Issuer: CN=The STEED Self-Signing Nonthority
+      Subject: CN=The STEED Self-Signing Nonthority
+     sha1_fpr: E6:99:39:A2:5F:5D:93:F2:06:71:5D:C9:FC:1A:25:DC:72:B0:BD:08
+      md5_fpr: C9:83:C8:13:91:53:5A:C2:9A:BA:AF:0E:9C:AF:93:0E
+       certid: BA9A5990A0E94A627D08D4D06FD15EC561FD15E8.01
+      keygrip: 68A638998DFABAC510EA645CE34F9686B2EDF7EA
+    notBefore: 2011-11-11 00:00:00
+     notAfter: 2106-02-06 00:00:00
+     hashAlgo: 1.2.840.113549.1.1.5 (sha1WithRSAEncryption)
+      keyType: 1024 bit RSA
+    subjKeyId: 68A638998DFABAC510EA645CE34F9686B2EDF7EA
+    authKeyId: [none]
+     keyUsage: certSign crlSign
+  extKeyUsage: [none]
+     policies: [none]
+  chainLength: 1
+        crlDP: [none]
+     authInfo: [none]
+     subjInfo: [none]
+         extn: 1.3.6.1.4.1.11591.2.2.2 (wellKnownPrivateKey)  [3 octets]
+
+
+-----BEGIN CERTIFICATE-----
+MIICKDCCAZGgAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDEyFUaGUg
+U1RFRUQgU2VsZi1TaWduaW5nIE5vbnRob3JpdHkwIBcNMTExMTExMDAwMDAwWhgP
+MjEwNjAyMDYwMDAwMDBaMCwxKjAoBgNVBAMTIVRoZSBTVEVFRCBTZWxmLVNpZ25p
+bmcgTm9udGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAk2h9kqe8
+0eb8ESY7UGV6j6S5zuP5DiM4TWJ3jKG2y+D2CyA1Sl90iZ6zyN3zCB0yR1xxhpuw
+xdrwBRovRFludAbx3MeynYhzXkk0Hwn038q1oIt2YUw3Igz34s24o455ZE86JQ/6
+5dC7ppF8Z1I9KBL96NO+qZR/alVAKxYAwS8CAwEAAaNYMFYwEgYDVR0TAQH/BAgw
+BgEB/wIBATARBgorBgEEAdpHAgICBAMBAf8wHQYDVR0OBBYEFGimOJmN+rrFEOpk
+XONPloay7ffqMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOBgQB3JwUn
+AbOdGv5ErojNSSP+yGZIy5av4wnkzK840Uj3jY6A5cuHroZGOD60hqLV2Hy0npox
+zte4phWEKWmZiXd8SCmd3MFNgZSieiixye0qxSmuqYft2j6NhEXD5xc/iTTjFT42
+SjGPLKAICuMBuGPnoozOEVlgqwaDqKOUph5sqw==
+-----END CERTIFICATE-----
+
+Created using these parameters:
+
+  Key-Type: RSA
+  Key-Length: 1024
+  Key-Grip: 68A638998DFABAC510EA645CE34F9686B2EDF7EA
+  Key-Usage: cert
+  Serial: 1
+  Name-DN: CN=The STEED Self-Signing Nonthority
+  Not-Before: 2011-11-11
+  Not-After: 2106-02-06
+  Subject-Key-Id: 68A638998DFABAC510EA645CE34F9686B2EDF7EA
+  Extension: 2.5.29.19 c 30060101ff020101
+  Extension: 1.3.6.1.4.1.11591.2.2.2 n 0101ff
+  Signing-Key: 68A638998DFABAC510EA645CE34F9686B2EDF7EA

commit 779611494dbd187d09b05d2eb10faabd31a70156
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 11:13:40 2011 +0100

    faq: Add section on US export restrictions.

diff --git a/doc/faq.org b/doc/faq.org
index ee6c0c7..a11fabe 100644
--- a/doc/faq.org
+++ b/doc/faq.org
@@ -1167,13 +1167,8 @@ update this FAQ in the next month.  See the section "Changes" for recent updates
    :CUSTOM_ID: i-get-sed-errors-when-running-configure-on-mac-os-x
    :END:
 
-    This will be fixed after GnuPG has been upgraded to autoconf-2.50.
-    Until then, find the line setting CDPATH in the configure script
-    and place an:
-
-    : unset CDPATH
-
-    statement below it.
+    This problem has been fixed for all modern GnuPG versions.
+    (By using an autoconf 2.50 generated configure script).
 
 ** Why does GnuPG 1.0.6 bail out on keyrings used with 1.0.7?
    :PROPERTIES:
@@ -1470,6 +1465,41 @@ update this FAQ in the next month.  See the section "Changes" for recent updates
     of the listing before before starting the import.
 
 
+* Bug reporting and hacking
+  :PROPERTIES:
+  :CUSTOM_ID: bugreports-et-al
+  :END:
+
+** Copyright asssignments
+  :PROPERTIES:
+  :CUSTOM_ID: copyright-assigments
+  :END:
+
+** U.S. export restrictions
+  :PROPERTIES:
+  :CUSTOM_ID: us-export-restrictions
+  :END:
+
+GnuPG has originally been developed in Germany because we have been
+able to do that without being affected by the US export restrictions.
+We had to reject any contributions from US citizens or from people
+living the the US.  That changed by end of 2000 when the export
+restrictions were basically dropped for all kind of freely available
+software.  However there are still some requirements in the US.
+Quoting David Shaw: mail
+#+begin_quote
+For each release of GPG that I contributed to, I sent an email
+containing a pointer to the new source code to the Commerce
+Department.  The rules changed slightly in 2004, so that you could
+send a single email and then be done until the information in that
+email changed, so I just sent "www.gnupg.org" and haven't bothered
+with the email since.
+#+end_quote
+
+The rules: http://www.bis.doc.gov/encryption/pubavailencsourcecodenofify.html
+The 2004 rule change: http://edocket.access.gpo.gov/2004/04-26992.htm
+
+
 * Acknowledgements
   :PROPERTIES:
   :CUSTOM_ID: acknowledgements

commit 366512abe44d9e71bb2c699c29477afa6ac71cdd
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 20 11:12:21 2011 +0100

    Require Libassuan 2.0.3
    
    * configure.ac: Require Libassuan 2.0.3.
    * agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
    * agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
    dependency.
    (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
    * scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.

diff --git a/agent/call-scd.c b/agent/call-scd.c
index 3f535db..deff294 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -45,15 +45,6 @@
 #define MAX_OPEN_FDS 20
 #endif
 
-/* This Assuan flag is only available since libassuan 2.0.2.  Because
-   comments lines are comments anyway we can use a replacement which
-   might not do anything.  assuan_{g,s}et_flag don't return an error
-   thus there won't be any ABI problem.  */
-#ifndef ASSUAN_CONVEY_COMMENTS
-#define ASSUAN_CONVEY_COMMENTS 4
-#endif
-
-
 /* Definition of module local data of the CTRL structure.  */
 struct scd_local_s
 {
diff --git a/agent/command.c b/agent/command.c
index c33c0d6..ad86a35 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -2310,12 +2310,8 @@ cmd_killagent (assuan_context_t ctx, char *line)
     return set_error (GPG_ERR_NOT_SUPPORTED, "no --use-standard-socket");
 
   ctrl->server_local->stopme = 1;
-#ifdef ASSUAN_FORCE_CLOSE
   assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
   return 0;
-#else
-  return gpg_error (GPG_ERR_EOF);
-#endif
 }
 
 
diff --git a/configure.ac b/configure.ac
index f71b9e8..9dd555e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.5.0
 
 NEED_LIBASSUAN_API=2
-NEED_LIBASSUAN_VERSION=2.0.0
+NEED_LIBASSUAN_VERSION=2.0.3
 
 NEED_KSBA_API=1
 NEED_KSBA_VERSION=1.2.0
diff --git a/scd/command.c b/scd/command.c
index afd5ef2..88f8ec2 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -1936,15 +1936,8 @@ cmd_killscd (assuan_context_t ctx, char *line)
   (void)line;
 
   ctrl->server_local->stopme = 1;
-#ifdef ASSUAN_FORCE_CLOSE
   assuan_set_flag (ctx, ASSUAN_FORCE_CLOSE, 1);
   return 0;
-#else
-  /* Actually returning an EOF does not anymore work with modern
-     Libassuan versions.  However we keep that non working code until
-     we make a Libassuan with the force close flag a requirement.  */
-  return gpg_error (GPG_ERR_EOF);
-#endif
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                               |    4 +-
 README.maint                                       |    2 +-
 agent/call-scd.c                                   |    9 ---
 agent/command.c                                    |    4 --
 configure.ac                                       |    6 +-
 doc/HACKING                                        |   13 +++--
 doc/com-certs.pem                                  |   18 +++++++
 doc/faq.org                                        |   44 +++++++++++++---
 po/de.po                                           |   32 ++++++++----
 scd/command.c                                      |    7 ---
 tests/Makefile.am                                  |    2 +
 .../68A638998DFABAC510EA645CE34F9686B2EDF7EA.key   |   10 ++++
 tests/samplekeys/README                            |    7 ++-
 tests/samplekeys/steed-self-signing-nonthority.pem |   54 ++++++++++++++++++++
 14 files changed, 161 insertions(+), 51 deletions(-)
 create mode 100644 tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
 create mode 100644 tests/samplekeys/steed-self-signing-nonthority.pem


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list