diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-06-25 20:47:34 -1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-25 20:47:34 -1000 |
| commit | cf14b9ff3004b9c9316417cd657a77797675b628 (patch) | |
| tree | 523656d9d9c820cd3023bf89132e33c732cfa555 /paramiko/dsskey.py | |
| parent | fdc09c9f93fd189a6398d5b350a3c91011d9b4cb (diff) | |
| parent | 842caba00262a81975cbfd186b846c83f72354e3 (diff) | |
| download | paramiko-cf14b9ff3004b9c9316417cd657a77797675b628.tar.gz | |
Merge branch 'master' into one-shot-methods
Diffstat (limited to 'paramiko/dsskey.py')
| -rw-r--r-- | paramiko/dsskey.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index ae7f9799..99734458 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -83,13 +83,7 @@ class DSSKey(PKey): 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' @@ -205,7 +199,7 @@ class DSSKey(PKey): generate a new host key or authentication key. :param int bits: number of bits the generated key should be. - :param function progress_func: Unused + :param progress_func: Unused :return: new `.DSSKey` private key """ numbers = dsa.generate_private_key( |