diff options
| author | Tapas Kundu <39723251+tapakund@users.noreply.github.com> | 2020-08-04 02:33:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 02:33:30 (GMT) |
| commit | 11d258ceafdf60ab3840f9a5700f2d0ad3e2e2d1 (patch) | |
| tree | 5886799983f76fb805a146154c9ebbeefbcff21e | |
| parent | f205f1000a2d7f8b044caf281041b3705f293480 (diff) | |
| download | cpython-11d258ceafdf60ab3840f9a5700f2d0ad3e2e2d1.zip cpython-11d258ceafdf60ab3840f9a5700f2d0ad3e2e2d1.tar.gz cpython-11d258ceafdf60ab3840f9a5700f2d0ad3e2e2d1.tar.bz2 | |
[3.5] bpo-41004: Resolve hash collisions for IPv4Interface and IPv6Interface (GH-21033) (#21233)
CVE-2020-14422: The __hash__() methods of classes IPv4Interface and IPv6Interface had issue
of generating constant hash values of 32 and 128 respectively causing hash collisions.
The fix uses the hash() function to generate hash values for the objects
instead of XOR operation.
(cherry picked from commit b30ee26e366bf509b7538d79bfec6c6d38d53f28)
Co-authored-by: Ravi Teja P <rvteja92@gmail.com>
Signed-off-by: Tapas Kundu <tkundu@vmware.com>
| -rw-r--r-- | Lib/ipaddress.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_ipaddress.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py index 35ca38e..b35c490 100644 --- a/Lib/ipaddress.py +++ b/Lib/ipaddress.py @@ -1418,7 +1418,7 @@ class IPv4Interface(IPv4Address): return False def __hash__(self): - return self._ip ^ self._prefixlen ^ int(self.network.network_address) + return hash((self._ip, self._prefixlen, int(self.network.network_address))) __reduce__ = _IPAddressBase.__reduce__ @@ -2109,7 +2109,7 @@ class IPv6Interface(IPv6Address): return False def __hash__(self): - return self._ip ^ self._prefixlen ^ int(self.network.network_address) + return hash((self._ip, self._prefixlen, int(self.network.network_address))) __reduce__ = _IPAddressBase.__reduce__ diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py index e3dec87..92c0812 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py @@ -1966,6 +1966,17 @@ class IpaddrUnitTest(unittest.TestCase): sixtofouraddr.sixtofour) self.assertFalse(bad_addr.sixtofour) + # issue41004 Hash collisions in IPv4Interface and IPv6Interface + def testV4HashIsNotConstant(self): + ipv4_address1 = ipaddress.IPv4Interface("1.2.3.4") + ipv4_address2 = ipaddress.IPv4Interface("2.3.4.5") + self.assertNotEqual(ipv4_address1.__hash__(), ipv4_address2.__hash__()) + + # issue41004 Hash collisions in IPv4Interface and IPv6Interface + def testV6HashIsNotConstant(self): + ipv6_address1 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:1") + ipv6_address2 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:2") + self.assertNotEqual(ipv6_address1.__hash__(), ipv6_address2.__hash__()) if __name__ == '__main__': unittest.main() diff --git a/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst b/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst new file mode 100644 index 0000000..f5a9db5 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2020-06-29-16-02-29.bpo-41004.ovF0KZ.rst @@ -0,0 +1 @@ +CVE-2020-14422: The __hash__() methods of ipaddress.IPv4Interface and ipaddress.IPv6Interface incorrectly generated constant hash values of 32 and 128 respectively. This resulted in always causing hash collisions. The fix uses hash() to generate hash values for the tuple of (address, mask length, network address). |