diff options
author | Sven Wegener <swegener@gentoo.org> | 2017-12-04 15:41:21 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2017-12-04 15:41:21 +0000 |
commit | c5edd5a90d920ff49ad549fe840599e3dc63fc0f (patch) | |
tree | a11baa8708e6bd4c48ccfa042a477f7195f4c048 /net-dns/pdns-recursor/files | |
parent | dev-cpp/waylandpp: 0.1.6 version bump (diff) | |
download | gentoo-c5edd5a90d920ff49ad549fe840599e3dc63fc0f.tar.gz gentoo-c5edd5a90d920ff49ad549fe840599e3dc63fc0f.tar.bz2 gentoo-c5edd5a90d920ff49ad549fe840599e3dc63fc0f.zip |
net-dns/pdns-recursor: Version bump
Package-Manager: Portage-2.3.14, Repoman-2.3.6
Diffstat (limited to 'net-dns/pdns-recursor/files')
-rw-r--r-- | net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch | 47 | ||||
-rw-r--r-- | net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch | 28 |
2 files changed, 0 insertions, 75 deletions
diff --git a/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch deleted file mode 100644 index 2695830b4420..000000000000 --- a/net-dns/pdns-recursor/files/CVE-2017-15093-4.0.6.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ru pdns-recursor-4.0.6.orig/ws-recursor.cc pdns-recursor-4.0.6/ws-recursor.cc ---- pdns-recursor-4.0.6.orig/ws-recursor.cc 2017-07-04 17:43:07.000000000 +0200 -+++ pdns-recursor-4.0.6/ws-recursor.cc 2017-11-02 18:13:55.762458134 +0100 -@@ -76,10 +76,11 @@ - throw ApiException("'value' must be an array"); - } - -+ NetmaskGroup nmg; - for (auto value : jlist.array_items()) { - try { -- Netmask(value.string_value()); -- } catch (NetmaskException &e) { -+ nmg.addMask(value.string_value()); -+ } catch (const NetmaskException &e) { - throw ApiException(e.reason); - } - } -@@ -91,9 +92,7 @@ - - // Clear allow-from, and provide a "parent" value - ss << "allow-from=" << endl; -- for (auto value : jlist.array_items()) { -- ss << "allow-from+=" << value.string_value() << endl; -- } -+ ss << "allow-from+=" << nmg.toString() << endl; - - apiWriteConfigFile("allow-from", ss.str()); - -@@ -201,10 +200,15 @@ - if (server == "") { - throw ApiException("Forwarded-to server must not be an empty string"); - } -- if (!serverlist.empty()) { -- serverlist += ";"; -+ try { -+ ComboAddress ca = parseIPAndPort(server, 53); -+ if (!serverlist.empty()) { -+ serverlist += ";"; -+ } -+ serverlist += ca.toStringWithPort(); -+ } catch (const PDNSException &e) { -+ throw ApiException(e.reason); - } -- serverlist += server; - } - if (serverlist == "") - throw ApiException("Need at least one upstream server when forwarding"); diff --git a/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch deleted file mode 100644 index ee7cf6878d98..000000000000 --- a/net-dns/pdns-recursor/files/CVE-2017-15094-4.0.6.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru pdns-recursor-4.0.6.orig/opensslsigners.cc pdns-recursor-4.0.6/opensslsigners.cc ---- pdns-recursor-4.0.6.orig/opensslsigners.cc 2017-07-04 17:43:07.000000000 +0200 -+++ pdns-recursor-4.0.6/opensslsigners.cc 2017-11-02 18:18:37.489408103 +0100 -@@ -474,7 +474,7 @@ - if (iqmp == NULL) { - RSA_free(key); - BN_clear_free(dmq1); -- BN_clear_free(iqmp); -+ BN_clear_free(dmp1); - throw runtime_error(getName()+" allocation of BIGNUM iqmp failed"); - } - RSA_set0_crt_params(key, dmp1, dmq1, iqmp); -@@ -562,6 +562,7 @@ - BIGNUM *n = BN_bin2bn((unsigned char*)modulus.c_str(), modulus.length(), NULL); - if (!n) { - RSA_free(key); -+ BN_clear_free(e); - throw runtime_error(getName()+" error loading n value of public key"); - } - -@@ -866,6 +867,7 @@ - - int ret = EC_POINT_oct2point(d_ecgroup, pub_key, (unsigned char*) ecdsaPoint.c_str(), ecdsaPoint.length(), d_ctx); - if (ret != 1) { -+ EC_POINT_free(pub_key); - throw runtime_error(getName()+" reading ECP point from binary failed"); - } - |