Attachment 248780 Details for Bug 277319 – a patch to add a patch file address CVE-2022-48521

[patch] a patch to add a patch file address CVE-2022-48521

mail_opendkim_update-patch.txt (text/plain), 1.47 KB, created by Yasuhito FUTATSUKI on 2024-02-27 06:31:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhito FUTATSUKI

Created: 2024-02-27 06:31:48 UTC

Size: 1.47 KB

patch

obsolete

>diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
>index 25294939abd9..a8a03cdc5fba 100644
>--- a/mail/opendkim/Makefile
>+++ b/mail/opendkim/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	opendkim
> PORTVERSION=	2.10.3
>-PORTREVISION=	16
>+PORTREVISION=	17
> CATEGORIES=	mail security
> MASTER_SITES=	SF/${PORTNAME} \
> 		SF/${PORTNAME}/Previous%20Releases \
>diff --git a/mail/opendkim/files/patch-opendkim_opendkim.c b/mail/opendkim/files/patch-opendkim_opendkim.c
>new file mode 100644
>index 000000000000..8ec336794477
>--- /dev/null
>+++ b/mail/opendkim/files/patch-opendkim_opendkim.c
>@@ -0,0 +1,36 @@
>+commit 7c70ee7c86da1cecc621182355cc950d3b193314
>+Author: David BÃ¼rgin <dbuergin@gluet.ch>
>+Date:   Sat Oct 14 09:19:37 2023 +0200
>+
>+    Delete Authentication-Results headers in reverse
>+
>+diff --git opendkim/opendkim.c opendkim/opendkim.c
>+index 803f37b0..cfa5f018 100644
>+--- opendkim/opendkim.c
>++++ opendkim/opendkim.c
>+@@ -13653,8 +13653,15 @@ mlfi_eom(SMFICTX *ctx)
>+ 			return SMFIS_TEMPFAIL;
>+ 		}
>+ 
>+-		c = 0;
>++		c = 1;
>++
>+ 		for (hdr = dfc->mctx_hqhead; hdr != NULL; hdr = hdr->hdr_next)
>++		{
>++			if (strcasecmp(hdr->hdr_hdr, AUTHRESULTSHDR) == 0)
>++				c++;
>++		}
>++
>++		for (hdr = dfc->mctx_hqtail; hdr != NULL; hdr = hdr->hdr_prev)
>+ 		{
>+ 			memset(ares, '\0', sizeof(struct authres));
>+ 
>+@@ -13666,7 +13673,7 @@ mlfi_eom(SMFICTX *ctx)
>+ 				char *slash;
>+ 
>+ 				/* remember index */
>+-				c++;
>++				c--;
>+ 
>+ 				/* parse the header */
>+ 				arstat = ares_parse((u_char *) hdr->hdr_val,

Actions: View | Diff

Attachments on bug 277319: 248773 | 248780