[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta834-21-g688a903

[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  688a903b4b3ad348c0d09e9d3fab8a12f4f94311 (commit)
      from  f2361e6d582d4343d71d294ed1da654afe7750ee (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 688a903b4b3ad348c0d09e9d3fab8a12f4f94311
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 2 19:17:34 2014 +0200

    gpg: Fix regression removing SHA256.
    
    * g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
    --
    
    Regression due to commit d33246700578cddd1cb8ed8164cfbba50aba4ef3
    
    GnuPG-bug-id: 1733.

diff --git a/configure.ac b/configure.ac
index 46a0aad..be10791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,7 +259,7 @@ GNUPG_GPG_DISABLE_ALGO([camellia192],[CAMELLIA192 cipher])
 GNUPG_GPG_DISABLE_ALGO([camellia256],[CAMELLIA256 cipher])
 
 GNUPG_GPG_DISABLE_ALGO([md5],[MD5 hash])
-# SHA1 is a MUSt algorithm
+# SHA1 is a MUST algorithm
 GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
 GNUPG_GPG_DISABLE_ALGO([sha224],[SHA-224 hash])
 # SHA256 is a MUST algorithm for GnuPG.
diff --git a/g10/misc.c b/g10/misc.c
index 76faa49..320e8af 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -686,11 +686,7 @@ map_md_openpgp_to_gcry (digest_algo_t algo)
     case DIGEST_ALGO_SHA224: return 0;
 #endif
 
-#ifdef GPG_USE_SHA256
     case DIGEST_ALGO_SHA256: return GCRY_MD_SHA256;
-#else
-    case DIGEST_ALGO_SHA256: return 0;
-#endif
 
 #ifdef GPG_USE_SHA384
     case DIGEST_ALGO_SHA384: return GCRY_MD_SHA384;

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

Summary of changes:
 configure.ac |    2 +-
 g10/misc.c   |    4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)


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