[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta834-4-g1d33d03

[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  1d33d03f0bb576601f5eef1a548cbc519f251b17 (commit)
       via  cf648fc5c8cb20bfea4fd303631ba311bbaf3659 (commit)
      from  72137a4522f9daafbd39f63841fda50e3537b33e (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 1d33d03f0bb576601f5eef1a548cbc519f251b17
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 18 16:00:34 2014 +0200

    gpg: --delete-secret-key - check that a secret key exists.
    
    * g10/delkey.c (do_delete_key): Check availibility of a secret key.
    --
    
    Actually we check that at least one secret subkey exists.

diff --git a/g10/delkey.c b/g10/delkey.c
index 3de705d..063de78 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -111,6 +111,15 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
         err = 0;
     }
 
+  if (secret && !have_secret_key_with_kid (keyid))
+    {
+      err = gpg_error (GPG_ERR_NOT_FOUND);
+      log_error (_("key \"%s\" not found: %s\n"), username, gpg_strerror (err));
+      write_status_text (STATUS_DELETE_PROBLEM, "1");
+      goto leave;
+    }
+
+
   if (opt.batch && exactmatch)
     okay++;
   else if (opt.batch && secret)

commit cf648fc5c8cb20bfea4fd303631ba311bbaf3659
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 18 16:00:34 2014 +0200

    gpg: Make algorithm selection prompt for ECC more clear.
    
    * g10/keygen.c (ask_algo): Change 9 to "ECC and ECC".

diff --git a/g10/keygen.c b/g10/keygen.c
index 4ae34bf..b6b50f6 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1833,7 +1833,7 @@ ask_algo (ctrl_t ctrl, int addmode, int *r_subkey_algo, unsigned int *r_usage,
 
 #if GPG_USE_ECDSA || GPG_USE_ECDH || GPG_USE_EDDSA
   if (opt.expert && !addmode)
-    tty_printf (_("   (%d) ECC\n"), 9 );
+    tty_printf (_("   (%d) ECC and ECC\n"), 9 );
   if (opt.expert)
     tty_printf (_("  (%d) ECC (sign only)\n"), 10 );
   if (opt.expert)

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

Summary of changes:
 g10/delkey.c |    9 +++++++++
 g10/keygen.c |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)


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