[Gpg4win-commits] r1220 - in trunk: . patches/gnupg2-2.0.12

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-07-30 17:33:59 +0200 (Thu, 30 Jul 2009)
New Revision: 1220

Added:
   trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
Log:
Add learn-card patch


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-29 07:59:24 UTC (rev 1219)
+++ trunk/ChangeLog	2009-07-30 15:33:59 UTC (rev 1220)
@@ -1,3 +1,7 @@
+2009-07-30  Werner Koch  <wk at g10code.com>
+
+	* patches/gnupg2-2.0.12/08-sm-learn-card.patch: New.
+
 2009-07-29  Colin Leroy  <colin at colino.net>
 
 	* packages/packages.current: Update Claws Mail (focus

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-07-29 07:59:24 UTC (rev 1219)
+++ trunk/Makefile.am	2009-07-30 15:33:59 UTC (rev 1220)
@@ -49,6 +49,7 @@
 	patches/gnupg2-2.0.12/05-dns-sd.patch \
         patches/gnupg2-2.0.12/06-opgp-sign3072.patch \
         patches/gnupg2-2.0.12/07-gpg-no-detached.patch \
+        patches/gnupg2-2.0.12/08-sm-learn-card.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch \
         patches/gpa-0.9.0/01-title-prop.patch \
 	patches/libetpan-0.57/01-gnutls_compat.patch \

Added: trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch
===================================================================
--- trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch	2009-07-29 07:59:24 UTC (rev 1219)
+++ trunk/patches/gnupg2-2.0.12/08-sm-learn-card.patch	2009-07-30 15:33:59 UTC (rev 1220)
@@ -0,0 +1,33 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+[sm]
+2009-07-30  Werner Koch  <wk at g10code.com>
+
+	* call-agent.c (learn_cb): Do not store as ephemeral.
+
+
+
+--- sm/call-agent.c     (revision 5101)
++++ sm/call-agent.c     (working copy)
+@@ -875,13 +875,11 @@
+       return 0;
+     }
+ 
++  /* We do not store a certifciate with missing issuers as ephemeral
++     because we can assume that the --learn-card command has been used
++     on purpose.  */
+   rc = gpgsm_basic_cert_check (parm->ctrl, cert);
+-  if (gpg_err_code (rc) == GPG_ERR_MISSING_CERT)
+-    { /* For later use we store it in the ephemeral database. */
+-      log_info ("issuer certificate missing - storing as ephemeral\n");
+-      keydb_store_cert (cert, 1, NULL);
+-    }
+-  else if (rc)
++  if (rc && gpg_err_code (rc) != GPG_ERR_MISSING_CERT)
+     log_error ("invalid certificate: %s\n", gpg_strerror (rc));
+   else
+     {
+
+