[git] GnuPG - branch, master, updated. gnupg-2.1.0-30-gf80c2dd

[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  f80c2dd78d522f12b2c7afbd5c0763a97d87d2bd (commit)
      from  cd2c6f36fe5d1d1d45546f5168aead5cbe6487e0 (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 f80c2dd78d522f12b2c7afbd5c0763a97d87d2bd
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 19 10:34:32 2014 +0100

    gpg: Fix hash detection for ECDSA.
    
    * g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
    --
    
    This error was introduced with
    commit b7f8dec6325f1c80640f878ed3080bbc194fbc78
    while separating EdDSA from ECDSA.
    
    Found due to a related bug report from Brian Minton.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/sign.c b/g10/sign.c
index e7d4a68..2e62f04 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -899,13 +899,12 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 	    for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next )
 	      {
 		if (sk_rover->pk->pubkey_algo == PUBKEY_ALGO_DSA
-                    || (sk_rover->pk->pubkey_algo == PUBKEY_ALGO_EDDSA
-                        && !openpgp_oid_is_ed25519 (sk_rover->pk->pkey[1])))
+                    || sk_rover->pk->pubkey_algo == PUBKEY_ALGO_ECDSA)
 		  {
 		    int temp_hashlen = (gcry_mpi_get_nbits
                                         (sk_rover->pk->pkey[1]));
 
-		    if (sk_rover->pk->pubkey_algo == PUBKEY_ALGO_EDDSA)
+		    if (sk_rover->pk->pubkey_algo == PUBKEY_ALGO_ECDSA)
 		      temp_hashlen = ecdsa_qbits_from_Q (temp_hashlen);
 		    temp_hashlen = (temp_hashlen+7)/8;
 
@@ -915,7 +914,7 @@ sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,
 		    if (hint.digest_length<temp_hashlen)
 		      hint.digest_length=temp_hashlen;
 		  }
-                /* FIXME: need toall gpg-agent */
+                /* FIXME: need to check gpg-agent for this. */
 		/* else if (sk_rover->pk->is_protected */
                 /*          && sk_rover->pk->protect.s2k.mode == 1002) */
 		/*   smartcard = 1;  */

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

Summary of changes:
 g10/sign.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


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