summaryrefslogtreecommitdiff
path: root/lib/fsm.c
diff options
context:
space:
mode:
authorJindrich Novy <jnovy@redhat.com>2009-02-27 14:34:39 +0100
committerJindrich Novy <jnovy@redhat.com>2009-02-27 14:34:39 +0100
commit7acdfded4a82e86a673418c3953aa6bf8106d313 (patch)
tree55dbba3fc4e91f2aa0a5622b0b5890e24b2ff3b6 /lib/fsm.c
parent299a7af7a8acc0fa4979d71dfaebe87658ee0c1d (diff)
downloadrpm-7acdfded4a82e86a673418c3953aa6bf8106d313.tar.gz
rpm-7acdfded4a82e86a673418c3953aa6bf8106d313.tar.bz2
rpm-7acdfded4a82e86a673418c3953aa6bf8106d313.zip
Add md5->filedigest aliases (rhbz#487597)
- add %verify(nofiledigest) as %verify(nomd5) file attribute alias - reference digests as digests not checksums - make old md5 related symbols obsolete and use newer reference - update man page accordingly
Diffstat (limited to 'lib/fsm.c')
-rw-r--r--lib/fsm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/fsm.c b/lib/fsm.c
index 160b99f27..b892b0397 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -780,9 +780,9 @@ static int fsmMapAttrs(FSM_t fsm)
{ rpmts ts = fsmGetTs(fsm);
/*
- * Set file checksum (if not disabled).
+ * Set file digest (if not disabled).
*/
- if (ts != NULL && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOMD5)) {
+ if (ts != NULL && !(rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST)) {
fsm->digest = rpmfiFDigestIndex(fi, i, NULL, NULL);
} else {
fsm->digest = NULL;
@@ -836,16 +836,16 @@ static int expandRegular(FSM_t fsm)
fdFiniDigest(fsm->wfd, fsm->digestalgo, &digest, NULL, asAscii);
if (digest == NULL) {
- rc = CPIOERR_MD5SUM_MISMATCH;
+ rc = CPIOERR_DIGEST_MISMATCH;
goto exit;
}
if (fsm->digest != NULL) {
size_t diglen = rpmDigestLength(fsm->digestalgo);
if (memcmp(digest, fsm->digest, diglen))
- rc = CPIOERR_MD5SUM_MISMATCH;
+ rc = CPIOERR_DIGEST_MISMATCH;
} else {
- rc = CPIOERR_MD5SUM_MISMATCH;
+ rc = CPIOERR_DIGEST_MISMATCH;
}
digest = _free(digest);
}