1 --- poldek-0.42.2/pm/rpmorg/signature.c.orig 2020-10-07 23:33:17.051835958 +0200
2 +++ poldek-0.42.2/pm/rpmorg/signature.c 2020-10-07 23:34:10.408960665 +0200
5 case RPMSIGTAG_PGP5: /* XXX legacy */
7 - flags |= VRFYSIG_SIGNPGP;
8 + flags |= PKGVERIFY_PGP;
13 - flags |= VRFYSIG_SIGNGPG;
14 + flags |= PKGVERIFY_GPG;
17 case RPMSIGTAG_LEMD5_2:
18 case RPMSIGTAG_LEMD5_1:
20 - flags |= VRFYSIG_DGST;
21 + flags |= PKGVERIFY_MD;
29 - n_assert(flags & (VRFYSIG_DGST | VRFYSIG_SIGN));
30 + n_assert(flags & (PKGVERIFY_MD | PKGVERIFY_GPG | PKGVERIFY_PGP));
32 if (!rpm_signatures(path, &presented_signs, NULL))
38 - if (flags & VRFYSIG_DGST)
39 + if (flags & PKGVERIFY_MD)
40 n += n_snprintf(&signam[n], sizeof(signam) - n, "digest/");
42 - if (flags & VRFYSIG_SIGNGPG)
43 + if (flags & PKGVERIFY_GPG)
44 n += n_snprintf(&signam[n], sizeof(signam) - n, "gpg/");
46 - if (flags & VRFYSIG_SIGNPGP)
47 + if (flags & PKGVERIFY_PGP)
48 n += n_snprintf(&signam[n], sizeof(signam) - n, "pgp/");
53 unsigned qva_flags = RPMVSF_DEFAULT;
55 - if ((flags & (VRFYSIG_SIGNPGP | VRFYSIG_SIGNGPG)) == 0) {
56 + if ((flags & (PKGVERIFY_PGP | PKGVERIFY_GPG)) == 0) {
57 qva_flags |= RPMVSF_MASK_NOSIGNATURES;
60 // always check digests - without them rpmVerifySignature returns error
61 - //if ((flags & VRFYSIG_DGST) == 0)
62 + //if ((flags & PKGVERIFY_MD) == 0)
63 // qva_flags |= RPMVSF_MASK_NODIGESTS;
65 memset(&qva, '\0', sizeof(qva));
69 DBGF("rpmVerifySignatures[md=%d, sign=%d] %s %s\n",
70 - flags & VRFYSIG_DGST ? 1:0, flags & VRFYSIG_SIGN ? 1:0,
71 + flags & PKGVERIFY_MD ? 1:0, flags & (PKGVERIFY_GPG | PKGVERIFY_PGP) ? 1:0,
72 n_basenam(path), rc == 0 ? "OK" : "BAD");
77 int do_pm_rpm_verify_signature(void *pm_rpm, const char *path, unsigned flags)
79 - unsigned rpmflags = 0;
82 if (access(path, R_OK) != 0) {
83 logn(LOGERR, "%s: verify signature failed: %m", path);
87 - if (flags & PKGVERIFY_GPG)
88 - rpmflags |= VRFYSIG_SIGNGPG;
90 - if (flags & PKGVERIFY_PGP)
91 - rpmflags |= VRFYSIG_SIGNPGP;
93 - if (flags & PKGVERIFY_MD)
94 - rpmflags |= VRFYSIG_DGST;
96 - return do_verify_signature(path, rpmflags);
97 + return do_verify_signature(path, flags);
100 extern int pm_rpm_verbose;
101 --- poldek-0.42.2/pm/rpmorg/pm_rpm.h.orig 2020-10-07 23:34:34.276110954 +0200
102 +++ poldek-0.42.2/pm/rpmorg/pm_rpm.h 2020-10-07 23:34:40.173648478 +0200
104 struct poldek_ts *ts);
106 #include <rpm/rpmcli.h>
107 -#define VRFYSIG_DGST VERIFY_DIGEST
108 -#define VRFYSIG_SIGN VERIFY_SIGNATURE
109 -#define VRFYSIG_SIGNGPG VERIFY_SIGNATURE
110 -#define VRFYSIG_SIGNPGP VERIFY_SIGNATURE
112 int pm_rpm_verify_signature(void *pm_rpm, const char *path, unsigned flags);