Attachment 113766 Details for Bug 127113 – Patch

[patch] Patch

rpm-4.4.x-signature.patch (text/plain), 2.59 KB, created by Paul Nasrat on 2005-04-28 11:20:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Nasrat

Created: 2005-04-28 11:20:58 UTC

Size: 2.59 KB

patch

obsolete

>--- rpm-4.4.1/lib/signature.c.signature	2005-02-02 18:26:14.000000000 +0000
>+++ rpm-4.4.1/lib/signature.c	2005-04-28 12:04:44.000000000 +0100
>@@ -262,7 +262,7 @@
> 
> 	xx = headerVerifyInfo(1, dl, info, &entry->info, 1);
> 	if (xx != -1 ||
>-	    !(entry->info.tag == RPMTAG_HEADERSIGNATURES
>+	    !((entry->info.tag == RPMTAG_HEADERSIGNATURES || entry->info.tag == RPMTAG_HEADERIMAGE)
> 	   && entry->info.type == RPM_BIN_TYPE
> 	   && entry->info.count == REGION_TAG_COUNT))
> 	{
>@@ -698,14 +698,28 @@
> 	if (h == NULL)
> 	    goto exit;
> 	(void) Fclose(fd);	fd = NULL;
>-	if (makeTempFile(NULL, &fn, &fd))
>-	    goto exit;
>-	if (headerWrite(fd, h, HEADER_MAGIC_YES))
>-	    goto exit;
>-	(void) Fclose(fd);	fd = NULL;
>-	if (makeGPGSignature(fn, &pkt, &pktlen, passPhrase)
>-	 || !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
>-	    goto exit;
>+
>+        if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
>+	    void * uh;
>+	    int_32 uht, uhc;
>+	
>+	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
>+	     ||  uh == NULL)
>+	    {
>+		h = headerFree(h);
>+		goto exit;
>+	    }
>+
>+                if (makeTempFile(NULL, &fn, &fd))
>+                    goto exit;
>+                if (headerWrite(fd, h, HEADER_MAGIC_YES))
>+                    goto exit;
>+                (void) Fclose(fd);	fd = NULL;
>+                if (makeGPGSignature(fn, &pkt, &pktlen, passPhrase)
>+                 || !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
>+                    goto exit;
>+        }
>+        headerFree(h);
> 	ret = 0;
> 	break;
>     case RPMSIGTAG_RSA:
>@@ -716,14 +730,28 @@
> 	if (h == NULL)
> 	    goto exit;
> 	(void) Fclose(fd);	fd = NULL;
>-	if (makeTempFile(NULL, &fn, &fd))
>-	    goto exit;
>-	if (headerWrite(fd, h, HEADER_MAGIC_YES))
>-	    goto exit;
>-	(void) Fclose(fd);	fd = NULL;
>-	if (makePGPSignature(fn, &pkt, &pktlen, passPhrase)
>-	 || !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
>-	    goto exit;
>+
>+        if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
>+	    void * uh;
>+	    int_32 uht, uhc;
>+	
>+	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
>+	     ||  uh == NULL)
>+	    {
>+		h = headerFree(h);
>+		goto exit;
>+	    }
>+
>+                if (makeTempFile(NULL, &fn, &fd))
>+                    goto exit;
>+                if (headerWrite(fd, h, HEADER_MAGIC_YES))
>+                    goto exit;
>+                (void) Fclose(fd);	fd = NULL;
>+                if (makePGPSignature(fn, &pkt, &pktlen, passPhrase)
>+                 || !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
>+                    goto exit;
>+        }
>+        headerFree(h);
> 	ret = 0;
> 	break;
>     }

Actions: View | Diff

Attachments on bug 127113: 113766