diff options
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 1b79253da..5193c9cea 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.258 2017/05/05 10:42:49 naddy Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.259 2017/05/30 08:52:20 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -93,7 +93,7 @@ char *xxx_host; | |||
93 | struct sockaddr *xxx_hostaddr; | 93 | struct sockaddr *xxx_hostaddr; |
94 | 94 | ||
95 | static int | 95 | static int |
96 | verify_host_key_callback(Key *hostkey, struct ssh *ssh) | 96 | verify_host_key_callback(struct sshkey *hostkey, struct ssh *ssh) |
97 | { | 97 | { |
98 | if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) == -1) | 98 | if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) == -1) |
99 | fatal("Host key verification failed."); | 99 | fatal("Host key verification failed."); |
@@ -319,7 +319,7 @@ static int sign_and_send_pubkey(Authctxt *, Identity *); | |||
319 | static void pubkey_prepare(Authctxt *); | 319 | static void pubkey_prepare(Authctxt *); |
320 | static void pubkey_cleanup(Authctxt *); | 320 | static void pubkey_cleanup(Authctxt *); |
321 | static void pubkey_reset(Authctxt *); | 321 | static void pubkey_reset(Authctxt *); |
322 | static Key *load_identity_file(Identity *); | 322 | static struct sshkey *load_identity_file(Identity *); |
323 | 323 | ||
324 | static Authmethod *authmethod_get(char *authlist); | 324 | static Authmethod *authmethod_get(char *authlist); |
325 | static Authmethod *authmethod_lookup(const char *name); | 325 | static Authmethod *authmethod_lookup(const char *name); |
@@ -574,7 +574,7 @@ int | |||
574 | input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt) | 574 | input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt) |
575 | { | 575 | { |
576 | Authctxt *authctxt = ctxt; | 576 | Authctxt *authctxt = ctxt; |
577 | Key *key = NULL; | 577 | struct sshkey *key = NULL; |
578 | Identity *id = NULL; | 578 | Identity *id = NULL; |
579 | Buffer b; | 579 | Buffer b; |
580 | int pktype, sent = 0; | 580 | int pktype, sent = 0; |
@@ -1015,7 +1015,7 @@ static int | |||
1015 | identity_sign(struct identity *id, u_char **sigp, size_t *lenp, | 1015 | identity_sign(struct identity *id, u_char **sigp, size_t *lenp, |
1016 | const u_char *data, size_t datalen, u_int compat) | 1016 | const u_char *data, size_t datalen, u_int compat) |
1017 | { | 1017 | { |
1018 | Key *prv; | 1018 | struct sshkey *prv; |
1019 | int ret; | 1019 | int ret; |
1020 | 1020 | ||
1021 | /* the agent supports this key */ | 1021 | /* the agent supports this key */ |
@@ -1225,10 +1225,10 @@ send_pubkey_test(Authctxt *authctxt, Identity *id) | |||
1225 | return 1; | 1225 | return 1; |
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | static Key * | 1228 | static struct sshkey * |
1229 | load_identity_file(Identity *id) | 1229 | load_identity_file(Identity *id) |
1230 | { | 1230 | { |
1231 | Key *private = NULL; | 1231 | struct sshkey *private = NULL; |
1232 | char prompt[300], *passphrase, *comment; | 1232 | char prompt[300], *passphrase, *comment; |
1233 | int r, perm_ok = 0, quit = 0, i; | 1233 | int r, perm_ok = 0, quit = 0, i; |
1234 | struct stat st; | 1234 | struct stat st; |