summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-15 08:51:43 +1000
committerDamien Miller <djm@mindrot.org>2011-05-15 08:51:43 +1000
commit9d276b8d689b4dc878fa6154e7b449c1c0c85290 (patch)
tree50f16c071c67d33641beb77d57845d037099a190
parent7c1b2c4ea8a5d06908dda3f8e406b902b81fe905 (diff)
- djm@cvs.openbsd.org 2011/05/13 00:05:36
[authfile.c] warn on unexpected key type in key_parse_private_type()
-rw-r--r--ChangeLog3
-rw-r--r--authfile.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 288a202c..af1fd1c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,9 @@
remove support for authorized_keys2; it is a relic from the early days
of protocol v.2 support and has been undocumented for many years;
ok markus@
+ - djm@cvs.openbsd.org 2011/05/13 00:05:36
+ [authfile.c]
+ warn on unexpected key type in key_parse_private_type()
20110510
- (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix
diff --git a/authfile.c b/authfile.c
index 7a5b6514..734d657e 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.89 2011/05/10 05:46:46 djm Exp $ */
+/* $OpenBSD: authfile.c,v 1.90 2011/05/13 00:05:36 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -643,6 +643,7 @@ key_parse_private_type(Buffer *blob, int type, const char *passphrase,
case KEY_UNSPEC:
return key_parse_private_pem(blob, type, passphrase, commentp);
default:
+ error("%s: cannot parse key type %d", __func__, type);
break;
}
return NULL;