upstream commit

avoid more fatal/exit in the packet.c paths that
 ssh-keyscan uses; feedback and "looks good" markus@

1 files changed, 5 insertions, 1 deletions

diff --git a/ssherr.c b/ssherr.c
index 0b79fbb00..5c29c467c 100644
--- a/ssherr.c
+++ b/ssherr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssherr.c,v 1.2 2015/01/28 21:15:47 djm Exp $  */
+/*      $OpenBSD: ssherr.c,v 1.3 2015/01/30 01:13:33 djm Exp $  */
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -129,6 +129,10 @@ ssh_err(int n)
                 return "Connection closed";
         case SSH_ERR_CONN_TIMEOUT:
                 return "Connection timed out";
+        case SSH_ERR_CONN_CORRUPT:
+                return "Connection corrupted";
+        case SSH_ERR_PROTOCOL_ERROR:
+                return "Protocol error";
         default:
                 return "unknown error";
         }