From b2cfc89de58d856c4c1c26a3a24b91610b38b243 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 8 Apr 2008 15:36:46 +0300 Subject: [PATCH] Simplify rpmtsImportPubkey() a bit --- lib/rpmts.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/rpmts.c b/lib/rpmts.c index fadd4b6..62eb6aa 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -381,7 +381,6 @@ rpmRC rpmtsImportPubkey(const rpmts ts, const unsigned char * pkt, size_t pktlen char * evr = NULL; Header h = NULL; rpmRC rc = RPMRC_FAIL; /* assume failure */ - char * t; int xx; if (pkt == NULL || pktlen == 0) @@ -405,19 +404,9 @@ rpmRC rpmtsImportPubkey(const rpmts ts, const unsigned char * pkt, size_t pktlen v = pgpHexStr(pubp->signid, sizeof(pubp->signid)); - t = pgpHexStr(pubp->time, sizeof(pubp->time)); - - n = t = xmalloc(sizeof("gpg()")+8); - t = stpcpy( stpcpy( stpcpy(t, "gpg("), v+8), ")"); - - /* FIX: pubp->userid may be NULL */ - u = t = xmalloc(sizeof("gpg()")+strlen(pubp->userid)); - t = stpcpy( stpcpy( stpcpy(t, "gpg("), pubp->userid), ")"); - - evr = t = xmalloc(sizeof("4X:-")+strlen(v)+strlen(r)); - t = stpcpy(t, (pubp->version == 4 ? "4:" : "3:")); - t = stpcpy( stpcpy( stpcpy(t, v), "-"), r); - + rasprintf(&n, "gpg(%s)", v+8); + rasprintf(&u, "gpg(%s)", pubp->userid ? pubp->userid : "none"); + rasprintf(&evr, "%d:%s-%s", pubp->version, v, r); /* Check for pre-existing header. */ /* Build pubkey header. */ -- 2.7.4