gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-25 07:08:13 -07:00
Code Issues Projects Releases Wiki Activity

mail-filter/opendmarc: remove unused patches

Browse Source 
Closes: https://github.com/gentoo/gentoo/pull/22125
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
2021-08-27 09:21:52 +02:00
committed by Conrad Kostecki
parent d297d1041e
commit c73a9d408e
2 changed files with 0 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
View File

@@ -1,35 +0,0 @@
From f6b615e345037408b88b2ffd1acd03239af8a858 Mon Sep 17 00:00:00 2001
From: Marcin Seremak <panpilkarz@protonmail.com>
Date: Tue, 30 Jul 2019 08:05:28 +0200
Subject: [PATCH] Fix multiple addresses in From vulnerability
---
libopendmarc/tests/test_finddomain.c | 1 +
opendmarc/opendmarc.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/libopendmarc/tests/test_finddomain.c b/libopendmarc/tests/test_finddomain.c
index 50cf405..8447463 100644
--- a/libopendmarc/tests/test_finddomain.c
+++ b/libopendmarc/tests/test_finddomain.c
@@ -23,6 +23,7 @@ main(int argc, char **argv)
/* 11 */ {"(,) joe@joe.com", "joe.com"},
/* 12 */ {"\"( bob@bob.com)\" joe@joe.com", "joe.com"},
/* 12 */ {"From: Davide D'Marco <user@blah.com>", "blah.com"},
+ /* 13 */ {"blah.com", "blah.com"},
{NULL, NULL},
};
u_char dbuf[256];
diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
index 419c15a..9b7fe3a 100644
--- a/opendmarc/opendmarc.c
+++ b/opendmarc/opendmarc.c
@@ -2193,7 +2193,7 @@ mlfi_eom(SMFICTX *ctx)
strncpy(dfc->mctx_fromdomain, domain, sizeof dfc->mctx_fromdomain - 1);
ostatus = opendmarc_policy_store_from_domain(cc->cctx_dmarc,
- from->hdr_value);
+ dfc->mctx_fromdomain);
if (ostatus != DMARC_PARSE_OKAY)
{
if (conf->conf_dolog)

41
mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
View File

@@ -1,41 +0,0 @@
From 50d28af25d8735504b6103537228ce7f76ad765f Mon Sep 17 00:00:00 2001
From: "Murray S. Kucherawy" <msk@blackops.org>
Date: Wed, 5 Aug 2020 21:56:01 +0000
Subject: [PATCH] In opendmarc_xml_parse(), ensure NULL-termination of the
buffer passed to opendmarc_xml().
---
libopendmarc/opendmarc_xml.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libopendmarc/opendmarc_xml.c b/libopendmarc/opendmarc_xml.c
index 26bb9dc..b3ac55a 100644
--- a/libopendmarc/opendmarc_xml.c
+++ b/libopendmarc/opendmarc_xml.c
@@ -158,7 +158,7 @@ opendmarc_xml(char *b, size_t blen, char *e, size_t elen)
if (*cp != '<')
continue;
++cp;
- for(sp = cp; *sp != '\0'; ++sp)
+ for (sp = cp; *sp != '\0'; ++sp)
{
if (*sp == '?')
break;
@@ -546,7 +546,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
if (fname == NULL)
{
xerror = errno;
- (void) snprintf(err_buf, err_len, "%s: %s", fname, "File name was NULL");
+ (void) snprintf(err_buf, err_len, "%s", "File name was NULL");
errno = EINVAL;
return NULL;
}
@@ -572,7 +572,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
return NULL;
}
- bufp = calloc(statb.st_size, 1);
+ bufp = calloc(statb.st_size + 1, 1);
if (bufp == NULL)
{
xerror = errno;