[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta783-9-ge5da80b

[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 "The GNU Privacy Guard".

The branch, master has been updated
       via  e5da80bc1888bf8801e69c9ff99f7f47550f7a09 (commit)
       via  3981ff15f3c0829ba22cd37794353502d996683c (commit)
      from  3259862cb4a7202e858f7bfd7a4b1796b38efff7 (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 e5da80bc1888bf8801e69c9ff99f7f47550f7a09
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 18 16:38:13 2014 +0200

    gpg: Install the current release signing pubkey.
    
    * g10/distsigkey.gpg: New.
    --
    
    This might be useful to help installing updates.

diff --git a/g10/Makefile.am b/g10/Makefile.am
index 0ae4ef7..6fa7a5c 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -18,7 +18,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = options.skel ChangeLog-2011 gpg-w32info.rc
+EXTRA_DIST = options.skel distsigkey.gpg ChangeLog-2011 gpg-w32info.rc
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
               -I$(top_srcdir)/include -I$(top_srcdir)/intl
@@ -161,9 +161,12 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) $(srcdir)/options.skel \
 				$(DESTDIR)$(pkgdatadir)/gpg-conf.skel
+	$(INSTALL_DATA) $(srcdir)/distsigkey.gpg \
+				$(DESTDIR)$(pkgdatadir)/distsigkey.gpg
 
 uninstall-local:
 	- at rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
+	- at rm $(DESTDIR)$(pkgdatadir)/distsigkey.gpg
 
 
 # There has never been a gpg for WindowsCE, thus we don't need a gpg2 here
diff --git a/g10/distsigkey.gpg b/g10/distsigkey.gpg
new file mode 100644
index 0000000..ccef8db
Binary files /dev/null and b/g10/distsigkey.gpg differ

commit 3981ff15f3c0829ba22cd37794353502d996683c
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 18 15:42:54 2014 +0200

    agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
    
    * agent/pksign.c (agent_pksign_do): Replace ENONET by NO_SECKEY.
    * agent/findkey.c (agent_key_from_file): No diagnostic for NO_SECKEY.
    * agent/pkdecrypt.c (agent_pkdecrypt): Replace checking for ENOENT.

diff --git a/agent/findkey.c b/agent/findkey.c
index 8725afb..5ff263e 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -605,7 +605,11 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
 
   rc = read_key_file (grip, &s_skey);
   if (rc)
-    return rc;
+    {
+      if (gpg_err_code (rc) == GPG_ERR_ENOENT)
+        rc = gpg_error (GPG_ERR_NO_SECKEY);
+      return rc;
+    }
 
   /* For use with the protection functions we also need the key as an
      canonical encoded S-expression in a buffer.  Create this buffer
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index 14aa78f..945de3c 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -72,9 +72,7 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
                             CACHE_MODE_NORMAL, NULL, &s_skey, NULL);
   if (rc)
     {
-      if (gpg_err_code (rc) == GPG_ERR_ENOENT)
-        rc = gpg_error (GPG_ERR_NO_SECKEY);
-      else
+      if (gpg_err_code (rc) != GPG_ERR_NO_SECKEY)
         log_error ("failed to read the secret key\n");
       goto leave;
     }
diff --git a/agent/pksign.c b/agent/pksign.c
index 713c8ba..9147b50 100644
--- a/agent/pksign.c
+++ b/agent/pksign.c
@@ -312,7 +312,8 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce,
                             &s_skey, NULL);
   if (rc)
     {
-      log_error ("failed to read the secret key\n");
+      if (gpg_err_code (rc) != GPG_ERR_NO_SECKEY)
+        log_error ("failed to read the secret key\n");
       goto leave;
     }
 
diff --git a/g10/call-agent.c b/g10/call-agent.c
index cf1b96a..58f4a92 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -210,8 +210,8 @@ check_hijacking (assuan_context_t ctx)
 
   init_membuf (&mb, 64);
 
-  /* AGENT_ID is a command implemented by gnome-keyring-daemon.  IT
-     does not reatun any data but an OK line with a remark.  */
+  /* AGENT_ID is a command implemented by gnome-keyring-daemon.  It
+     does not return any data but an OK line with a remark.  */
   if (assuan_transact (ctx, "AGENT_ID",
                        membuf_data_cb, &mb, NULL, NULL, NULL, NULL))
     {

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

Summary of changes:
 agent/findkey.c    |    6 +++++-
 agent/pkdecrypt.c  |    4 +---
 agent/pksign.c     |    3 ++-
 g10/Makefile.am    |    5 ++++-
 g10/call-agent.c   |    4 ++--
 g10/distsigkey.gpg |  Bin 0 -> 863 bytes
 6 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 g10/distsigkey.gpg


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