diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2017-04-11 14:17:42 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-04-11 19:00:45 +0300 |
| commit | 5b4f59bd80be07289e62f6162ec566ad55211c5d (patch) | |
| tree | c6be0b3a9320a1844c5ca7b09dc6f19f90442e6d | |
| parent | de3a173010054ca6abd8f7533200c9b0ed728b86 (diff) | |
| download | rpm-5b4f59bd80be07289e62f6162ec566ad55211c5d.tar.gz | |
Rename signature info bits and pieces for consistency and future needs
Rename the oddball sigtInfo struct to rpmsinfo, and the "constructor"
to rpmsinfoInit() which will make a nicer pair for Fini() once we'll
need that.
| -rw-r--r-- | lib/package.c | 4 | ||||
| -rw-r--r-- | lib/rpmchecksig.c | 8 | ||||
| -rw-r--r-- | lib/signature.c | 4 | ||||
| -rw-r--r-- | lib/signature.h | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/package.c b/lib/package.c index 78dbc0edd..dde504a85 100644 --- a/lib/package.c +++ b/lib/package.c @@ -161,7 +161,7 @@ static rpmRC headerSigVerify(rpmKeyring keyring, rpmVSFlags vsflags, pgpDigParams sig = NULL; struct rpmtd_s sigtd; struct entryInfo_s einfo; - struct sigtInfo_s sinfo; + struct rpmsinfo_s sinfo; rpmtdReset(&sigtd); memset(&einfo, 0, sizeof(einfo)); @@ -205,7 +205,7 @@ static rpmRC headerSigVerify(rpmKeyring keyring, rpmVSFlags vsflags, goto exit; } - if (rpmSigInfoParse(&sigtd, "header", &sinfo, &sig, buf)) + if (rpmsinfoInit(&sigtd, "header", &sinfo, &sig, buf)) goto exit; if (sinfo.hashalgo) { diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 79b6947cf..009489b26 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -219,12 +219,12 @@ static void formatResult(rpmTagVal sigtag, rpmRC sigres, const char *result, static void initDigests(FD_t fd, Header sigh, int range, rpmQueryFlags flags) { - struct sigtInfo_s sinfo; + struct rpmsinfo_s sinfo; struct rpmtd_s sigtd; HeaderIterator hi = headerInitIterator(sigh); for (; headerNext(hi, &sigtd) != 0; rpmtdFreeData(&sigtd)) { - if (rpmSigInfoParse(&sigtd, "package", &sinfo, NULL, NULL)) + if (rpmsinfoInit(&sigtd, "package", &sinfo, NULL, NULL)) continue; if (!(flags & VERIFY_SIGNATURE) && sinfo.type == RPMSIG_SIGNATURE_TYPE) continue; @@ -242,7 +242,7 @@ static int verifyItems(FD_t fd, Header sigh, int range, rpmQueryFlags flags, char **missingKeys, char **untrustedKeys, char **buf) { int failed = 0; - struct sigtInfo_s sinfo; + struct rpmsinfo_s sinfo; struct rpmtd_s sigtd; pgpDigParams sig = NULL; char *result = NULL; @@ -254,7 +254,7 @@ static int verifyItems(FD_t fd, Header sigh, int range, rpmQueryFlags flags, result = _free(result); /* Note: we permit failures to be ignored via disablers */ - rpmRC rc = rpmSigInfoParse(&sigtd, "package", &sinfo, &sig, &result); + rpmRC rc = rpmsinfoInit(&sigtd, "package", &sinfo, &sig, &result); if (!(flags & VERIFY_SIGNATURE) && sinfo.type == RPMSIG_SIGNATURE_TYPE) continue; diff --git a/lib/signature.c b/lib/signature.c index f8ef61215..0a4a0b979 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -21,8 +21,8 @@ #include "debug.h" -rpmRC rpmSigInfoParse(rpmtd td, const char *origin, - struct sigtInfo_s *sinfo, pgpDigParams *sigp, char **msg) +rpmRC rpmsinfoInit(rpmtd td, const char *origin, + struct rpmsinfo_s *sinfo, pgpDigParams *sigp, char **msg) { rpmRC rc = RPMRC_FAIL; rpm_tagtype_t tagtype = 0; diff --git a/lib/signature.h b/lib/signature.h index c44daa8e0..d216bd0f3 100644 --- a/lib/signature.h +++ b/lib/signature.h @@ -21,7 +21,7 @@ enum { RPMSIG_PAYLOAD = (1 << 1), }; -struct sigtInfo_s { +struct rpmsinfo_s { int id; int hashalgo; int range; @@ -78,8 +78,8 @@ rpmRC rpmGenerateSignature(char *SHA256, char *SHA1, uint8_t *MD5, rpm_loff_t size, rpm_loff_t payloadSize, FD_t fd); RPM_GNUC_INTERNAL -rpmRC rpmSigInfoParse(rpmtd td, const char *origin, - struct sigtInfo_s *sigt, pgpDigParams *sigp, char **msg); +rpmRC rpmsinfoInit(rpmtd td, const char *origin, + struct rpmsinfo_s *sigt, pgpDigParams *sigp, char **msg); #ifdef __cplusplus } |