[git] GPGME - branch, master, updated. gpgme-1.6.0-367-g268e251

[by Werner Koch]

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 "GnuPG Made Easy".

The branch, master has been updated
       via  268e251b802cc7c19831722d7e3a52777a0f412f (commit)
       via  1f9641dd0fb08e4a3df3b507b974a3f78887920f (commit)
      from  ed1f2700a73060e2615697491ea9e49ded4293e6 (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 268e251b802cc7c19831722d7e3a52777a0f412f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Sep 16 11:45:07 2016 +0200

    core: Remove stub to try implementing gpg < 2.1 support for createkey.
    
    * src/engine-gpg.c (gpg_createkey_legacy): Remove.
    (gpg_genkey): Remove call.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index d2741cb..a7431d5 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -2051,25 +2051,6 @@ gpg_createkey_from_param (engine_gpg_t gpg,
 }
 
 
-/* This is used for gpg versions which do not support the quick-genkey
- * command to emulate the gpgme_op_createkey API.  */
-static gpgme_error_t
-gpg_createkey_legacy (engine_gpg_t gpg,
-               const char *userid, const char *algo,
-               unsigned long expires,
-               unsigned int flags,
-               unsigned int extraflags)
-{
-  (void)gpg;
-  (void)userid;
-  (void)algo;
-  (void)expires;
-  (void)flags;
-  (void)extraflags;
-  return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-}
-
-
 static gpgme_error_t
 gpg_createkey (engine_gpg_t gpg,
                const char *userid, const char *algo,
@@ -2204,16 +2185,10 @@ gpg_genkey (void *engine,
       else
         err = gpg_createkey_from_param (gpg, help_data, extraflags);
     }
-  else if (userid && !key)
-    {
-      if (!have_gpg_version (gpg, "2.1.13"))
-        err = gpg_createkey_legacy (gpg, userid, algo, expires, flags,
-                                    extraflags);
-      else
-        err = gpg_createkey (gpg, userid, algo, expires, flags, extraflags);
-    }
   else if (!have_gpg_version (gpg, "2.1.13"))
     err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+  else if (userid && !key)
+    err = gpg_createkey (gpg, userid, algo, expires, flags, extraflags);
   else if (!userid && key)
     err = gpg_addkey (gpg, algo, expires, key, flags, extraflags);
   else if (userid && key && !algo)

commit 1f9641dd0fb08e4a3df3b507b974a3f78887920f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Sep 16 11:43:32 2016 +0200

    core: Fix setting og the verification result.
    
    * src/verify.c (parse_new_sig): Proberly handle the RC in an ERRSIG
    status.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/verify.c b/src/verify.c
index 6bdbe66..eb1cc10 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -366,25 +366,10 @@ parse_new_sig (op_data_t opd, gpgme_status_code_t code, char *args,
 	end++;
 
       /* Parse the return code.  */
-      if (end[0] && (!end[1] || end[1] == ' '))
-	{
-	  switch (end[0])
-	    {
-	    case '4':
-	      sig->status = gpg_error (GPG_ERR_UNSUPPORTED_ALGORITHM);
-	      break;
-
-	    case '9':
-	      sig->status = gpg_error (GPG_ERR_NO_PUBKEY);
-	      break;
-
-	    default:
-	      sig->status = gpg_error (GPG_ERR_GENERAL);
-	    }
-	}
-      else
+      if (!*end)
 	goto parse_err_sig_fail;
 
+      sig->status = strtoul (end, NULL, 10);
       goto parse_err_sig_ok;
 
     parse_err_sig_fail:

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

Summary of changes:
 src/engine-gpg.c | 29 ++---------------------------
 src/verify.c     | 19 ++-----------------
 2 files changed, 4 insertions(+), 44 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org