summaryrefslogtreecommitdiff
path: root/auth2-pubkey.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-12-21 00:00:28 +0000
committerDamien Miller <djm@mindrot.org>2017-12-21 15:40:19 +1100
commitd45d69f2a937cea215c7f0424e5a4677b6d8c7fe (patch)
tree8808d64b31825f6117237e81f25771ea99ff0c8b /auth2-pubkey.c
parentc5a6cbdb79752f7e761074abdb487953ea6db671 (diff)
upstream commit
revert stricter key type / signature type checking in userauth path; too much software generates inconsistent messages, so we need a better plan. OpenBSD-Commit-ID: 4a44ddc991c803c4ecc8f1ad40e0ab4d22e1c519
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r--auth2-pubkey.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index eac79cc3..0713a9de 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.73 2017/12/19 00:24:34 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.74 2017/12/21 00:00:28 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -214,7 +214,7 @@ userauth_pubkey(struct ssh *ssh)
authenticated = 0;
if (PRIVSEP(user_key_allowed(authctxt->pw, key, 1)) &&
PRIVSEP(sshkey_verify(key, sig, slen, sshbuf_ptr(b),
- sshbuf_len(b), pkalg, ssh->compat)) == 0) {
+ sshbuf_len(b), NULL, ssh->compat)) == 0) {
authenticated = 1;
}
sshbuf_free(b);