diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2017-03-08 15:29:58 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-03-08 15:29:58 +0200 |
| commit | 3c9be24c11974886453bfaf1ff9309c0e6af3c42 (patch) | |
| tree | 6479b26c6d3835bb9d56c6955381e3242cf257ce | |
| parent | 0cd74ade37d16d282d13e781deb68a219b2c04b9 (diff) | |
| download | rpm-3c9be24c11974886453bfaf1ff9309c0e6af3c42.tar.gz | |
Add a VSF control bit to disable payload digest verification
As in, honor --nodigest for the new compressed payload digest too.
There's now _RPMVSF_NOPAYLOAD and RPMVSF_NOPAYLOAD meaning entirely
different things, there might be some confusion on the road ahead.
Better names for these things would be welcome...
Should've really been in commit daeb53bae7da50102c9114b8672ea4dd679d74cd.
| -rw-r--r-- | lib/rpmts.h | 5 | ||||
| -rw-r--r-- | python/rpmmodule.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/rpmts.h b/lib/rpmts.h index b6dac90f6..99bcbf2a9 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -99,7 +99,8 @@ enum rpmVSFlags_e { RPMVSF_NOSHA256HEADER = (1 << 9), RPMVSF_NODSAHEADER = (1 << 10), RPMVSF_NORSAHEADER = (1 << 11), - /* bit(s) 12-16 unused */ + /* bit(s) 12-15 unused */ + RPMVSF_NOPAYLOAD = (1 << 16), RPMVSF_NOMD5 = (1 << 17), RPMVSF_NODSA = (1 << 18), RPMVSF_NORSA = (1 << 19) @@ -111,6 +112,7 @@ typedef rpmFlags rpmVSFlags; #define _RPMVSF_NODIGESTS \ ( RPMVSF_NOSHA1HEADER | \ RPMVSF_NOSHA256HEADER | \ + RPMVSF_NOPAYLOAD | \ RPMVSF_NOMD5 ) #define _RPMVSF_NOSIGNATURES \ @@ -127,6 +129,7 @@ typedef rpmFlags rpmVSFlags; #define _RPMVSF_NOPAYLOAD \ ( RPMVSF_NOMD5 | \ + RPMVSF_NOPAYLOAD | \ RPMVSF_NODSA | \ RPMVSF_NORSA ) diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 66951d309..9741ee77c 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -537,6 +537,7 @@ static int initModule(PyObject *m) REGISTER_ENUM(RPMVSF_NOSHA256HEADER); REGISTER_ENUM(RPMVSF_NODSAHEADER); REGISTER_ENUM(RPMVSF_NORSAHEADER); + REGISTER_ENUM(RPMVSF_NOPAYLOAD); REGISTER_ENUM(RPMVSF_NOMD5); REGISTER_ENUM(RPMVSF_NODSA); REGISTER_ENUM(RPMVSF_NORSA); |