diff options
Diffstat (limited to 'ssh_api.c')
-rw-r--r-- | ssh_api.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh_api.c,v 1.4 2015/02/16 22:13:32 djm Exp $ */ | 1 | /* $OpenBSD: ssh_api.c,v 1.5 2015/12/04 16:41:28 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2012 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2012 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -40,8 +40,8 @@ int _ssh_order_hostkeyalgs(struct ssh *); | |||
40 | int _ssh_verify_host_key(struct sshkey *, struct ssh *); | 40 | int _ssh_verify_host_key(struct sshkey *, struct ssh *); |
41 | struct sshkey *_ssh_host_public_key(int, int, struct ssh *); | 41 | struct sshkey *_ssh_host_public_key(int, int, struct ssh *); |
42 | struct sshkey *_ssh_host_private_key(int, int, struct ssh *); | 42 | struct sshkey *_ssh_host_private_key(int, int, struct ssh *); |
43 | int _ssh_host_key_sign(struct sshkey *, struct sshkey *, u_char **, | 43 | int _ssh_host_key_sign(struct sshkey *, struct sshkey *, |
44 | size_t *, const u_char *, size_t, u_int); | 44 | u_char **, size_t *, const u_char *, size_t, const char *, u_int); |
45 | 45 | ||
46 | /* | 46 | /* |
47 | * stubs for the server side implementation of kex. | 47 | * stubs for the server side implementation of kex. |
@@ -49,7 +49,7 @@ int _ssh_host_key_sign(struct sshkey *, struct sshkey *, u_char **, | |||
49 | */ | 49 | */ |
50 | int use_privsep = 0; | 50 | int use_privsep = 0; |
51 | int mm_sshkey_sign(struct sshkey *, u_char **, u_int *, | 51 | int mm_sshkey_sign(struct sshkey *, u_char **, u_int *, |
52 | u_char *, u_int, u_int); | 52 | u_char *, u_int, char *, u_int); |
53 | DH *mm_choose_dh(int, int, int); | 53 | DH *mm_choose_dh(int, int, int); |
54 | 54 | ||
55 | /* Define these two variables here so that they are part of the library */ | 55 | /* Define these two variables here so that they are part of the library */ |
@@ -58,7 +58,7 @@ u_int session_id2_len = 0; | |||
58 | 58 | ||
59 | int | 59 | int |
60 | mm_sshkey_sign(struct sshkey *key, u_char **sigp, u_int *lenp, | 60 | mm_sshkey_sign(struct sshkey *key, u_char **sigp, u_int *lenp, |
61 | u_char *data, u_int datalen, u_int compat) | 61 | u_char *data, u_int datalen, char *alg, u_int compat) |
62 | { | 62 | { |
63 | return (-1); | 63 | return (-1); |
64 | } | 64 | } |
@@ -530,8 +530,8 @@ _ssh_order_hostkeyalgs(struct ssh *ssh) | |||
530 | 530 | ||
531 | int | 531 | int |
532 | _ssh_host_key_sign(struct sshkey *privkey, struct sshkey *pubkey, | 532 | _ssh_host_key_sign(struct sshkey *privkey, struct sshkey *pubkey, |
533 | u_char **signature, size_t *slen, | 533 | u_char **signature, size_t *slen, const u_char *data, size_t dlen, |
534 | const u_char *data, size_t dlen, u_int compat) | 534 | const char *alg, u_int compat) |
535 | { | 535 | { |
536 | return sshkey_sign(privkey, signature, slen, data, dlen, compat); | 536 | return sshkey_sign(privkey, signature, slen, data, dlen, alg, compat); |
537 | } | 537 | } |