diff options
| author | Werner Koch <wk@gnupg.org> | 2014-10-02 19:17:34 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-10-02 19:17:34 +0200 |
| commit | 688a903b4b3ad348c0d09e9d3fab8a12f4f94311 (patch) | |
| tree | a99bbcabd48b93bca2b1d516f4b8aca649c17d3b | |
| parent | First changes for future use of NTBTLS. (diff) | |
| download | gnupg2-688a903b4b3ad348c0d09e9d3fab8a12f4f94311.tar.xz gnupg2-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.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | g10/misc.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 46a0aade5..be1079102 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 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; |