diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 23:29:24 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 23:29:24 -0700 |
| commit | 77a35401cc62a4abc9eced101aa2ab8439548c54 (patch) | |
| tree | e216360e8cf9550cdef009b35c0a29a6c01e6d3b /paramiko/hostkeys.py | |
| parent | bc07b04e8ed4ddf9e97cf80cf39021828b94b3cf (diff) | |
| parent | 1fa69c7003bac49c22721ac694fe399f369ece8a (diff) | |
| download | paramiko-77a35401cc62a4abc9eced101aa2ab8439548c54.tar.gz | |
Merge branch '1.13' into 1.14
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 c0caeda9..cd65e77c 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 |