From 7593041aa50ecfb5bec7cf1e09fc3534cd8f2178 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 30 Nov 2012 12:23:42 +0200 Subject: [PATCH] Fix build with older NSS versions that dont support SHA224 - SHA224-support was added around NSS 3.13, dont break compilation with older versions just for this rarely used hash. - HASH_AlgSHA224 is an enum so test for SHA224_LENGTH define instead (cherry picked from commit e15e29823451663e27a5bec6c865b37901f1c315) --- rpmio/digest_nss.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rpmio/digest_nss.c b/rpmio/digest_nss.c index d94d5e7..c4ce7d0 100644 --- a/rpmio/digest_nss.c +++ b/rpmio/digest_nss.c @@ -113,7 +113,9 @@ static HASH_HashType getHashType(int hashalgo) case PGPHASHALGO_MD5: return HASH_AlgMD5; case PGPHASHALGO_MD2: return HASH_AlgMD2; case PGPHASHALGO_SHA1: return HASH_AlgSHA1; +#ifdef SHA224_LENGTH case PGPHASHALGO_SHA224: return HASH_AlgSHA224; +#endif case PGPHASHALGO_SHA256: return HASH_AlgSHA256; case PGPHASHALGO_SHA384: return HASH_AlgSHA384; case PGPHASHALGO_SHA512: return HASH_AlgSHA512; @@ -211,7 +213,9 @@ static SECOidTag getHashAlg(unsigned int hashalgo) case PGPHASHALGO_MD5: return SEC_OID_MD5; case PGPHASHALGO_MD2: return SEC_OID_MD2; case PGPHASHALGO_SHA1: return SEC_OID_SHA1; +#ifdef SHA224_LENGTH case PGPHASHALGO_SHA224: return SEC_OID_SHA224; +#endif case PGPHASHALGO_SHA256: return SEC_OID_SHA256; case PGPHASHALGO_SHA384: return SEC_OID_SHA384; case PGPHASHALGO_SHA512: return SEC_OID_SHA512; -- 2.7.4