aboutsummaryrefslogtreecommitdiffstats
path: root/g10/misc.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-10-02 17:17:34 +0000
committerWerner Koch <[email protected]>2014-10-02 17:17:34 +0000
commit688a903b4b3ad348c0d09e9d3fab8a12f4f94311 (patch)
treea99bbcabd48b93bca2b1d516f4b8aca649c17d3b /g10/misc.c
parentFirst changes for future use of NTBTLS. (diff)
downloadgnupg-688a903b4b3ad348c0d09e9d3fab8a12f4f94311.tar.gz
gnupg-688a903b4b3ad348c0d09e9d3fab8a12f4f94311.zip
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.
Diffstat (limited to 'g10/misc.c')
-rw-r--r--g10/misc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/g10/misc.c b/g10/misc.c
index 76faa49f6..320e8afbf 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;