summaryrefslogtreecommitdiff
path: root/ssherr.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-02-16 22:13:32 +0000
committerDamien Miller <djm@mindrot.org>2015-02-17 09:32:32 +1100
commit523463a3a2a9bfc6cfc5afa01bae9147f76a37cc (patch)
tree772be92cee9553c19d51b4570113c3d4de0c2d8b /ssherr.c
parent6c5c949782d86a6e7d58006599c7685bfcd01685 (diff)
upstream commit
Revise hostkeys@openssh.com hostkey learning extension. The client will not ask the server to prove ownership of the private halves of any hitherto-unseen hostkeys it offers to the client. Allow UpdateHostKeys option to take an 'ask' argument to let the user manually review keys offered. ok markus@
Diffstat (limited to 'ssherr.c')
-rw-r--r--ssherr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ssherr.c b/ssherr.c
index 5c29c467c..4ca793992 100644
--- a/ssherr.c
+++ b/ssherr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssherr.c,v 1.3 2015/01/30 01:13:33 djm Exp $ */ 1/* $OpenBSD: ssherr.c,v 1.4 2015/02/16 22:13:32 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2011 Damien Miller 3 * Copyright (c) 2011 Damien Miller
4 * 4 *
@@ -121,6 +121,8 @@ ssh_err(int n)
121 return "agent not present"; 121 return "agent not present";
122 case SSH_ERR_AGENT_NO_IDENTITIES: 122 case SSH_ERR_AGENT_NO_IDENTITIES:
123 return "agent contains no identities"; 123 return "agent contains no identities";
124 case SSH_ERR_BUFFER_READ_ONLY:
125 return "internal error: buffer is read-only";
124 case SSH_ERR_KRL_BAD_MAGIC: 126 case SSH_ERR_KRL_BAD_MAGIC:
125 return "KRL file has invalid magic number"; 127 return "KRL file has invalid magic number";
126 case SSH_ERR_KEY_REVOKED: 128 case SSH_ERR_KEY_REVOKED: