From 5046e63f279b4be78279abcc327606b894dcb8c9 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 29 May 2008 15:20:05 +0300 Subject: [PATCH] Make rpmfiConfigConflict() honor fi digest algorithm --- lib/rpmfi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/rpmfi.c b/lib/rpmfi.c index f71391f..4e7a03a 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -593,11 +593,12 @@ int rpmfiConfigConflict(const rpmfi fi) memset(buffer, 0, sizeof(buffer)); if (newWhat == REG) { - const unsigned char * ndigest; - if (rpmDoDigest(PGPHASHALGO_MD5, fn, 0, (unsigned char *)buffer, NULL)) + pgpHashAlgo algo; + size_t diglen; + const unsigned char *ndigest = rpmfiDigest(fi, &algo, &diglen); + if (rpmDoDigest(algo, fn, 0, (unsigned char *)buffer, NULL)) return 0; /* assume file has been removed */ - ndigest = rpmfiMD5(fi); - if (ndigest && !memcmp(ndigest, buffer, 16)) + if (ndigest && !memcmp(ndigest, buffer, diglen)) return 0; /* unmodified config file */ } else /* newWhat == LINK */ { const char * nFLink; -- 2.7.4