2004-03-07 Marcus Brinkmann <marcus@g10code.de>

	* configure.ac (NEED_GPGSM_VERSION): Bump up to 1.9.6.

2004-03-07  Marcus Brinkmann  <marcus@g10code.de>

	* gpgsm/t-keylist.c: Add chain IDs.

diff --git a/ChangeLog b/ChangeLog
index e973e7bccc9e6ae9f765c4b154b68f793acf0604..44436f5c2d1be8e3db90f22833d5e0a137edf86b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
        Released 0.4.5.
 
+       * configure.ac (NEED_GPGSM_VERSION): Bump up to 1.9.6.
+
        * Makefile.am (EXTRA_DIST): Remove autogen.sh and README.CVS.
 
 2004-02-18  Werner Koch  <wk@gnupg.org>

diff --git a/configure.ac b/configure.ac
index 163fa4ac2a212b485d6e2746c7261c1a0825459d..12b7138e95b42b7d8c3f4871172869aa5df973a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ LIBGPGME_LT_CURRENT=13
 LIBGPGME_LT_AGE=2
 LIBGPGME_LT_REVISION=0
 NEED_GPG_VERSION=1.2.2
-NEED_GPGSM_VERSION=1.9.3
+NEED_GPGSM_VERSION=1.9.6
 ##############################################
 AC_PREREQ(2.52)
 AC_REVISION($Revision$)

diff --git a/tests/ChangeLog b/tests/ChangeLog
index ff9a9c7021e6cefb447be74ff1992b2484d1cd23..1b182ca18baeb02a5a525dbeaf35af8cae759911 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-07  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpgsm/t-keylist.c: Add chain IDs.
+
 2004-03-03  Werner Koch  <wk@gnupg.org>
 
        * gpgsm/t-export.c (main): Also check exporting 2 certificates.

diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index 3c38fa775fe6973ac9ca082a201d0576b0772cb8..06aecefef15fb30d0516b089d7b48c84e9f3e7e6 100644 (file)
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -48,12 +48,13 @@ keys[] =
   {
     { "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E", 1, 1007372198, 1038908198, "00",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      NULL,
+      "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE" },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
-      "O=Deutsches Forschungsnetz,C=DE", NULL,
+      "O=Deutsches Forschungsnetz,C=DE",
+      "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE" },