From 9f03f42e2614a68f589f9db8fe76287146522c0c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 30 Sep 2021 09:56:20 +0300 Subject: [PATCH] Refactor pgpDigParams construction to helper function No functional changes, just to reduce code duplication and needed by the following commits. Dependent patch: CVE: CVE-2021-3521 Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/9f03f42e2614a68f589f9db8fe76287146522c0c] Signed-off-by: Riyaz Khan --- rpmio/rpmpgp.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index 340de5fc9a..aad7c275c9 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -1055,6 +1055,13 @@ unsigned int pgpDigParamsAlgo(pgpDigParams digp, unsigned int algotype) return algo; } +static pgpDigParams pgpDigParamsNew(uint8_t tag) +{ + pgpDigParams digp = xcalloc(1, sizeof(*digp)); + digp->tag = tag; + return digp; +} + int pgpPrtParams(const uint8_t * pkts, size_t pktlen, unsigned int pkttype, pgpDigParams * ret) { @@ -1072,8 +1079,7 @@ int pgpPrtParams(const uint8_t * pkts, size_t pktlen, unsigned int pkttype, if (pkttype && pkt.tag != pkttype) { break; } else { - digp = xcalloc(1, sizeof(*digp)); - digp->tag = pkt.tag; + digp = pgpDigParamsNew(pkt.tag); } } @@ -1121,8 +1127,7 @@ int pgpPrtParamsSubkeys(const uint8_t *pkts, size_t pktlen, digps = xrealloc(digps, alloced * sizeof(*digps)); } - digps[count] = xcalloc(1, sizeof(**digps)); - digps[count]->tag = PGPTAG_PUBLIC_SUBKEY; + digps[count] = pgpDigParamsNew(PGPTAG_PUBLIC_SUBKEY); /* Copy UID from main key to subkey */ digps[count]->userid = xstrdup(mainkey->userid);