Use RPMTAG_FILEDIGESTS instead of MD5S internally

- no functional changes

diff --git a/build/files.c b/build/files.c
index 47ad289..2e6cc57 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1122,8 +1122,8 @@ static void genCpioListAndHeader(FileList fl,
            (void) rpmDoDigest(PGPHASHALGO_MD5, flp->diskPath, 1, 
                               (unsigned char *)buf, NULL);
        s = buf;
-       (void) headerAddOrAppendEntry(h, RPMTAG_FILEMD5S, RPM_STRING_ARRAY_TYPE,
-                              &s, 1);
+       (void) headerAddOrAppendEntry(h, RPMTAG_FILEDIGESTS, 
+                                     RPM_STRING_ARRAY_TYPE, &s, 1);
        
        buf[0] = '\0';
        if (S_ISLNK(flp->fl_mode)) {

diff --git a/lib/query.c b/lib/query.c
index 6025c93..cf96153 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -423,7 +423,7 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
         for (i = 0, t = MD5, s = arg; i < 16; i++, t++, s += 2)
             *t = (rnibble(s[0]) << 4) | rnibble(s[1]);
 
-       qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEMD5S, MD5, sizeof(MD5));
+       qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEDIGESTS, MD5, sizeof(MD5));
        if (qva->qva_mi == NULL) {
            rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
                        "fileid", arg);

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 6a3799e..cb4ce55 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -2367,7 +2367,7 @@ static int td2key(rpmtd tagdata, DBT *key)
     case RPM_I18NSTRING_TYPE:
     case RPM_STRING_ARRAY_TYPE:
        str = rpmtdGetString(tagdata);
-       if (rpmtdTag(tagdata) == RPMTAG_FILEMD5S) {
+       if (rpmtdTag(tagdata) == RPMTAG_FILEDIGESTS) {
            uint8_t * t = bin;
            /* Filter out empty MD5 strings. */
            if (!(str && *str != '\0'))

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index e5c3c24..fd4c3bb 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -1281,7 +1281,7 @@ if (fi->actions == NULL)
     fi->digestalgo = PGPHASHALGO_MD5;
     fi->digests = NULL;
     /* grab hex digests from header and store in binary format */
-    if (headerGet(h, RPMTAG_FILEMD5S, &fdigests, HEADERGET_MINMEM)) {
+    if (headerGet(h, RPMTAG_FILEDIGESTS, &fdigests, HEADERGET_MINMEM)) {
        const char *fdigest;
        size_t diglen = rpmDigestLength(fi->digestalgo);
        fi->digests = t = xmalloc(rpmtdCount(&fdigests) * diglen);