diff options
| author | Jeremy T. Bouse <jbouse@debian.org> | 2014-08-28 22:23:08 -0700 |
|---|---|---|
| committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-08-28 22:23:08 -0700 |
| commit | 87432e7ba4c5605f96ebf90de68b5a1d39193004 (patch) | |
| tree | da54f2772c9eb6615e9702b5fdee058333fb8d44 /paramiko/hostkeys.py | |
| parent | e93504a2d0a549833b9fa4f4046dfe2396467de9 (diff) | |
| parent | 588a4823436454e8968ee36ae95ff92e1cddc3f7 (diff) | |
| download | python-paramiko-87432e7ba4c5605f96ebf90de68b5a1d39193004.tar python-paramiko-87432e7ba4c5605f96ebf90de68b5a1d39193004.tar.gz | |
Merge tag 'upstream/1.14.1'
Upstream version 1.14.1
Diffstat (limited to 'paramiko/hostkeys.py')
| -rw-r--r-- | paramiko/hostkeys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index c0caeda..cd65e77 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -179,7 +179,7 @@ class HostKeys (MutableMapping): entries = [] for e in self._entries: for h in e.hostnames: - if h.startswith('|1|') and constant_time_bytes_eq(self.hash_host(hostname, h), h) or h == hostname: + if h.startswith('|1|') and not hostname.startswith('|1|') and constant_time_bytes_eq(self.hash_host(hostname, h), h) or h == hostname: entries.append(e) if len(entries) == 0: return None |