diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:29:59 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:50:33 +1000 |
commit | eb272ea4099fd6157846f15c129ac5727933aa69 (patch) | |
tree | 7c721828dc6504e4adaa6517ce65840eaaba06ef /auth2-pubkey.c | |
parent | 5a146bbd4fdf5c571f9fb438e5210d28cead76d9 (diff) |
upstream commit
switch auth2 to ssh_dispatch API; ok djm@
Upstream-ID: a752ca19e2782900dd83060b5c6344008106215f
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index a4a091113..7a6280f8d 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.64 2017/05/30 14:10:53 markus Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.65 2017/05/30 14:29:59 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -75,9 +75,9 @@ extern u_char *session_id2; | |||
75 | extern u_int session_id2_len; | 75 | extern u_int session_id2_len; |
76 | 76 | ||
77 | static int | 77 | static int |
78 | userauth_pubkey(Authctxt *authctxt) | 78 | userauth_pubkey(struct ssh *ssh) |
79 | { | 79 | { |
80 | struct ssh *ssh = active_state; /* XXX */ | 80 | Authctxt *authctxt = ssh->authctxt; |
81 | struct sshbuf *b; | 81 | struct sshbuf *b; |
82 | struct sshkey *key = NULL; | 82 | struct sshkey *key = NULL; |
83 | char *pkalg, *userstyle = NULL, *fp = NULL; | 83 | char *pkalg, *userstyle = NULL, *fp = NULL; |