diff options
Diffstat (limited to 'mail-filter/opendmarc')
| -rw-r--r-- | mail-filter/opendmarc/Manifest | 2 | ||||
| -rw-r--r-- | mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch | 35 | ||||
| -rw-r--r-- | mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch | 41 |
3 files changed, 0 insertions, 78 deletions
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest index 3e6a7fbc2aef..188bff8b62ae 100644 --- a/mail-filter/opendmarc/Manifest +++ b/mail-filter/opendmarc/Manifest @@ -1,5 +1,3 @@ -AUX opendmarc-1.3.2-multiple-From.patch 1394 BLAKE2B 91b36a131ca9dca5e33f3a9610ab5c3ba17bf7f44f891d278f4c070629987a4177166c176692edd36dee184948811f727a9752e3c6adcbaf1822cfe9aa6d0c8e SHA512 068f58f25133fc6216c437ba9df5a44d5e7139c471f85d63bea81d7c930a56a2900239bc051cf2a3ed7f60fac939a0090bbef4a690c78457911e267293019d66 -AUX opendmarc-1.3.3-CVE-2020-12460.patch 1302 BLAKE2B 8bd4a1f6aaf44e9931fb97553d2e072aa5efa3114e75f5240107a5c126fe432829cc515d29e5c0e082a013b4e2dd90b5eed8b4b07ec8110c63c3fe00248a8955 SHA512 98582c2b0a08d77b27856331f28214b7b5fa3972c572189ed21963030e98858285a5a69851f173d08380bf409d985980e7c61de5d571af11062f0d394fc8b5f5 AUX opendmarc-1.4.1.1-CVE-2021-34555.patch 2517 BLAKE2B 93ebfb101591e5b797b52de4d85a6e199c208544076a7d5bc05fb8b7237c663a204a45172d4cf38d408daf57d5076929b3de227e4e787d97c85aad3e42af9d03 SHA512 24df989c7a501ffea5da43469e049f4a5d9de82f2fe67875f93bad690f558d1734b9d4ea2da1a6aebdedb80b576ada8e12844e7aa061117dd41da3e23c24e176 AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129 diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch b/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch deleted file mode 100644 index 28b2f852f39a..000000000000 --- a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch +++ /dev/null @@ -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) diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch b/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch deleted file mode 100644 index 334c11d5302f..000000000000 --- a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch +++ /dev/null @@ -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; |