upstream: switch over to the new authorized_keys options API and

remove the legacy one.

Includes a fairly big refactor of auth2-pubkey.c to retain less state
between key file lines.

feedback and ok markus@

OpenBSD-Commit-ID: dece6cae0f47751b9892080eb13d6625599573df

1 files changed, 2 insertions, 2 deletions

diff --git a/auth2-passwd.c b/auth2-passwd.c
index 5f7ba3244..445016aec 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-passwd.c,v 1.14 2017/05/30 14:29:59 markus Exp $ */
+/* $OpenBSD: auth2-passwd.c,v 1.15 2018/03/03 03:15:51 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -63,7 +63,7 @@ userauth_passwd(struct ssh *ssh)
 
         if (change)
                 logit("password change not supported");
-        else if (PRIVSEP(auth_password(ssh->authctxt, password)) == 1)
+        else if (PRIVSEP(auth_password(ssh, password)) == 1)
                 authenticated = 1;
         explicit_bzero(password, len);
         free(password);