From bf855e6da326dba0c46f005eedc9f390c6c3b206 Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Sun, 25 Oct 2015 22:29:43 -0400 Subject: Imported Upstream version 1.15.3 --- paramiko/hostkeys.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'paramiko/hostkeys.py') diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py index 8486887..c7e1f72 100644 --- a/paramiko/hostkeys.py +++ b/paramiko/hostkeys.py @@ -35,6 +35,7 @@ from paramiko.dsskey import DSSKey from paramiko.rsakey import RSAKey from paramiko.util import get_logger, constant_time_bytes_eq from paramiko.ecdsakey import ECDSAKey +from paramiko.ssh_exception import SSHException class HostKeys (MutableMapping): @@ -96,7 +97,10 @@ class HostKeys (MutableMapping): line = line.strip() if (len(line) == 0) or (line[0] == '#'): continue - e = HostKeyEntry.from_line(line, lineno) + try: + e = HostKeyEntry.from_line(line, lineno) + except SSHException: + continue if e is not None: _hostnames = e.hostnames for h in _hostnames: -- cgit v1.2.3