[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.30-6-gfb0e18b

[by NIIBE Yutaka]

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, STABLE-BRANCH-2-0 has been updated
       via  fb0e18b38434cbe97dee4c26047a994baf02fe76 (commit)
      from  c68d39f7114623075c0b407b05927b61b190a377 (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 fb0e18b38434cbe97dee4c26047a994baf02fe76
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jun 23 12:12:43 2016 +0900

    g10: Fix card-edit/fetch to use keyserver_fetch.
    
    * g10/card-util.c (fetch_url): Call keyserver_fetch instead of
    keyserver_import_fprint.
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
    
    GnuPG-bug-id: 1828
    (backport of master
    commit 6f5ff1cfe449cf1f4cb7287bc57570eb794216b2)

diff --git a/g10/card-util.c b/g10/card-util.c
index 2198cb2..745ba1d 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -729,28 +729,18 @@ fetch_url(void)
     log_error("error retrieving URL from card: %s\n",gpg_strerror(rc));
   else
     {
-      struct keyserver_spec *spec=NULL;
-
       rc=agent_scd_getattr("KEY-FPR",&info);
       if(rc)
 	log_error("error retrieving key fingerprint from card: %s\n",
 		  gpg_strerror(rc));
       else if (info.pubkey_url && *info.pubkey_url)
-	{
-	  spec=parse_keyserver_uri(info.pubkey_url,1,NULL,0);
-	  if(spec && info.fpr1valid)
-	    {
-	      /* This is not perfectly right.  Currently, all card
-		 fingerprints are 20 digits, but what about
-		 fingerprints for a future v5 key?  We should get the
-		 length from somewhere lower in the code.  In any
-		 event, the fpr/keyid is not meaningful for straight
-		 HTTP fetches, but using it allows the card to point
-		 to HKP and LDAP servers as well. */
-	      rc=keyserver_import_fprint(info.fpr1,20,spec);
-	      free_keyserver_spec(spec);
-	    }
-	}
+        {
+          strlist_t sl = NULL;
+
+          add_to_strlist (&sl, info.pubkey_url);
+          rc = keyserver_fetch (sl);
+          free_strlist (sl);
+        }
       else if (info.fpr1valid)
 	{
           rc = keyserver_import_fprint (info.fpr1, 20, opt.keyserver);

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

Summary of changes:
 g10/card-util.c | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)


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