From e6d91a00f0782f7551552d851f38c9ef188f7308 Mon Sep 17 00:00:00 2001

From: Panu Matilainen <pmatilai@redhat.com>

Date: Tue, 10 Oct 2017 15:04:38 +0300

Subject: [PATCH 09/33] Eliminate redundant signature length calculation

 function

The actual signing function knows the length already, we just need to

return it and then we can insert it if there was anything at all

to sign.

---

 sign/rpmsignfiles.c | 40 ++++++++++++++--------------------------

 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/sign/rpmsignfiles.c b/sign/rpmsignfiles.c

index de7a73cfd..9fe6e6d41 100644

--- a/sign/rpmsignfiles.c

+++ b/sign/rpmsignfiles.c

@@ -33,7 +33,7 @@ static const char *hash_algo_name[] = {

 #define ARRAY_SIZE(a)  (sizeof(a) / sizeof(a[0]))

 static char *signFile(const char *algo, const uint8_t *fdigest, int diglen,

-const char *key, char *keypass)

+const char *key, char *keypass, uint32_t *siglenp)

 {

     char *fsignature;

     unsigned char digest[diglen];

@@ -56,32 +56,18 @@ const char *key, char *keypass)

 	return NULL;

     }

+    *siglenp = siglen + 1;

     /* convert file signature binary to hex */

     fsignature = pgpHexStr(signature, siglen+1);

     return fsignature;

 }

-static uint32_t signatureLength(const char *algo, int diglen, const char *key,

-char *keypass)

-{

-    unsigned char digest[diglen];

-    unsigned char signature[MAX_SIGNATURE_LENGTH];

-

-    memset(digest, 0, diglen);

-    memset(signature, 0, MAX_SIGNATURE_LENGTH);

-    signature[0] = '\x03';

-

-    uint32_t siglen = sign_hash(algo, digest, diglen, key, keypass,

-				signature+1);

-    return siglen + 1;

-}

-

 rpmRC rpmSignFiles(Header sigh, Header h, const char *key, char *keypass)

 {

     struct rpmtd_s td;

     int algo;

     int diglen;

-    uint32_t siglen;

+    uint32_t siglen = 0;

     const char *algoname;

     const uint8_t *digest;

     char *signature = NULL;

@@ -108,14 +94,6 @@ rpmRC rpmSignFiles(Header sigh, Header h, const char *key, char *keypass)

     headerDel(sigh, RPMTAG_FILESIGNATURELENGTH);

     headerDel(sigh, RPMTAG_FILESIGNATURES);

-    siglen = signatureLength(algoname, diglen, key, keypass);

-

-    rpmtdReset(&td);

-    td.tag = RPMSIGTAG_FILESIGNATURELENGTH;

-    td.type = RPM_INT32_TYPE;

-    td.data = &siglen;

-    td.count = 1;

-    headerPut(sigh, &td, HEADERPUT_DEFAULT);

     rpmtdReset(&td);

     td.tag = RPMSIGTAG_FILESIGNATURES;

@@ -125,7 +103,7 @@ rpmRC rpmSignFiles(Header sigh, Header h, const char *key, char *keypass)

     while (rpmfiNext(fi) >= 0) {

 	digest = rpmfiFDigest(fi, NULL, NULL);

-	signature = signFile(algoname, digest, diglen, key, keypass);

+	signature = signFile(algoname, digest, diglen, key, keypass, &siglen);

 	if (!signature) {

 	    rpmlog(RPMLOG_ERR, _("signFile failed\n"));

 	    goto exit;

@@ -137,6 +115,16 @@ rpmRC rpmSignFiles(Header sigh, Header h, const char *key, char *keypass)

 	}

 	signature = _free(signature);

     }

+

+    if (siglen > 0) {

+	rpmtdReset(&td);

+	td.tag = RPMSIGTAG_FILESIGNATURELENGTH;

+	td.type = RPM_INT32_TYPE;

+	td.data = &siglen;

+	td.count = 1;

+	headerPut(sigh, &td, HEADERPUT_DEFAULT);

+    }

+

     rc = RPMRC_OK;

 exit:

-- 

2.13.5