Merge d69ef77 into 5061ee6

paramiko · Mar 22, 2017 · 744601d · 744601d
2 parents 5061ee6 + d69ef77
commit 744601d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py
@@ -82,13 +82,7 @@ def __str__(self):
         return self.asbytes()
 
     def __hash__(self):
-        h = hash(self.get_name())
-        h = h * 37 + hash(self.p)
-        h = h * 37 + hash(self.q)
-        h = h * 37 + hash(self.g)
-        h = h * 37 + hash(self.y)
-        # h might be a long by now...
-        return hash(h)
+        return hash((self.get_name(), self.p, self.q, self.g, self.y))
 
     def get_name(self):
         return 'ssh-dss'

diff --git a/paramiko/ecdsakey.py b/paramiko/ecdsakey.py
@@ -165,10 +165,8 @@ def __str__(self):
         return self.asbytes()
 
     def __hash__(self):
-        h = hash(self.get_name())
-        h = h * 37 + hash(self.verifying_key.public_numbers().x)
-        h = h * 37 + hash(self.verifying_key.public_numbers().y)
-        return hash(h)
+        return hash((self.get_name(), self.verifying_key.public_numbers().x,
+                     self.verifying_key.public_numbers().y))
 
     def get_name(self):
         return self.ecdsa_curve.key_format_identifier

diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py
@@ -89,10 +89,8 @@ def __str__(self):
             return self.asbytes().decode('utf8', errors='ignore')
 
     def __hash__(self):
-        h = hash(self.get_name())
-        h = h * 37 + hash(self.public_numbers.e)
-        h = h * 37 + hash(self.public_numbers.n)
-        return hash(h)
+        return hash((self.get_name(), self.public_numbers.e,
+                     self.public_numbers.n))
 
     def get_name(self):
         return 'ssh-rsa'