diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth2.c | 9 | ||||
-rw-r--r-- | authfd.c | 6 | ||||
-rw-r--r-- | authfd.h | 6 | ||||
-rw-r--r-- | authfile.c | 4 | ||||
-rw-r--r-- | kexdh.c | 4 | ||||
-rw-r--r-- | kexgex.c | 6 | ||||
-rw-r--r-- | key.c | 19 | ||||
-rw-r--r-- | key.h | 6 | ||||
-rw-r--r-- | ssh-dss.c | 10 | ||||
-rw-r--r-- | ssh-dss.h | 6 | ||||
-rw-r--r-- | ssh-keygen.c | 4 | ||||
-rw-r--r-- | ssh-rsa.c | 10 | ||||
-rw-r--r-- | ssh-rsa.h | 6 | ||||
-rw-r--r-- | sshconnect2.c | 24 |
15 files changed, 66 insertions, 60 deletions
@@ -38,6 +38,10 @@ | |||
38 | - markus@cvs.openbsd.org 2002/02/24 18:31:09 | 38 | - markus@cvs.openbsd.org 2002/02/24 18:31:09 |
39 | [uuencode.c] | 39 | [uuencode.c] |
40 | typo in comment | 40 | typo in comment |
41 | - markus@cvs.openbsd.org 2002/02/24 19:14:59 | ||
42 | [auth2.c authfd.c authfd.h authfile.c kexdh.c kexgex.c key.c key.h | ||
43 | ssh-dss.c ssh-dss.h ssh-keygen.c ssh-rsa.c ssh-rsa.h sshconnect2.c] | ||
44 | signed vs. unsigned: make size arguments u_int, ok stevesk@ | ||
41 | 45 | ||
42 | 20020225 | 46 | 20020225 |
43 | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() | 47 | - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() |
@@ -7711,4 +7715,4 @@ | |||
7711 | - Wrote replacements for strlcpy and mkdtemp | 7715 | - Wrote replacements for strlcpy and mkdtemp |
7712 | - Released 1.0pre1 | 7716 | - Released 1.0pre1 |
7713 | 7717 | ||
7714 | $Id: ChangeLog,v 1.1884 2002/02/26 18:07:26 mouring Exp $ | 7718 | $Id: ChangeLog,v 1.1885 2002/02/26 18:09:42 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.84 2002/02/04 11:58:10 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.85 2002/02/24 19:14:59 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -398,7 +398,8 @@ userauth_pubkey(Authctxt *authctxt) | |||
398 | { | 398 | { |
399 | Buffer b; | 399 | Buffer b; |
400 | Key *key = NULL; | 400 | Key *key = NULL; |
401 | char *pkalg, *pkblob, *sig; | 401 | char *pkalg; |
402 | u_char *pkblob, *sig; | ||
402 | u_int alen, blen, slen; | 403 | u_int alen, blen, slen; |
403 | int have_sig, pktype; | 404 | int have_sig, pktype; |
404 | int authenticated = 0; | 405 | int authenticated = 0; |
@@ -512,7 +513,8 @@ userauth_hostbased(Authctxt *authctxt) | |||
512 | { | 513 | { |
513 | Buffer b; | 514 | Buffer b; |
514 | Key *key = NULL; | 515 | Key *key = NULL; |
515 | char *pkalg, *pkblob, *sig, *cuser, *chost, *service; | 516 | char *pkalg, *cuser, *chost, *service; |
517 | u_char *pkblob, *sig; | ||
516 | u_int alen, blen, slen; | 518 | u_int alen, blen, slen; |
517 | int pktype; | 519 | int pktype; |
518 | int authenticated = 0; | 520 | int authenticated = 0; |
@@ -794,4 +796,3 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, | |||
794 | 796 | ||
795 | return (host_status == HOST_OK); | 797 | return (host_status == HOST_OK); |
796 | } | 798 | } |
797 | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.47 2002/01/18 18:14:17 stevesk Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.48 2002/02/24 19:14:59 markus Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -374,8 +374,8 @@ ssh_decrypt_challenge(AuthenticationConnection *auth, | |||
374 | int | 374 | int |
375 | ssh_agent_sign(AuthenticationConnection *auth, | 375 | ssh_agent_sign(AuthenticationConnection *auth, |
376 | Key *key, | 376 | Key *key, |
377 | u_char **sigp, int *lenp, | 377 | u_char **sigp, u_int *lenp, |
378 | u_char *data, int datalen) | 378 | u_char *data, u_int datalen) |
379 | { | 379 | { |
380 | extern int datafellows; | 380 | extern int datafellows; |
381 | Buffer msg; | 381 | Buffer msg; |
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: authfd.h,v 1.21 2001/08/07 10:37:46 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: authfd.h,v 1.22 2002/02/24 19:14:59 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef AUTHFD_H | 16 | #ifndef AUTHFD_H |
17 | #define AUTHFD_H | 17 | #define AUTHFD_H |
@@ -74,7 +74,7 @@ ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16], | |||
74 | u_int, u_char[16]); | 74 | u_int, u_char[16]); |
75 | 75 | ||
76 | int | 76 | int |
77 | ssh_agent_sign(AuthenticationConnection *, Key *, u_char **, int *, u_char *, | 77 | ssh_agent_sign(AuthenticationConnection *, Key *, u_char **, u_int *, u_char *, |
78 | int); | 78 | u_int); |
79 | 79 | ||
80 | #endif /* AUTHFD_H */ | 80 | #endif /* AUTHFD_H */ |
diff --git a/authfile.c b/authfile.c index e35714e93..50ae9aa78 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.46 2002/02/14 23:41:01 markus Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.47 2002/02/24 19:14:59 markus Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -168,7 +168,7 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase, | |||
168 | int fd; | 168 | int fd; |
169 | int success = 0; | 169 | int success = 0; |
170 | int len = strlen(_passphrase); | 170 | int len = strlen(_passphrase); |
171 | char *passphrase = (len > 0) ? (char *)_passphrase : NULL; | 171 | u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; |
172 | EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; | 172 | EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; |
173 | 173 | ||
174 | if (len > 0 && len <= 4) { | 174 | if (len > 0 && len <= 4) { |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdh.c,v 1.15 2002/02/23 17:59:02 markus Exp $"); | 26 | RCSID("$OpenBSD: kexdh.c,v 1.16 2002/02/24 19:14:59 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
@@ -201,7 +201,7 @@ kexdh_server(Kex *kex) | |||
201 | Key *server_host_key; | 201 | Key *server_host_key; |
202 | u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; | 202 | u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; |
203 | u_int sbloblen, klen, kout; | 203 | u_int sbloblen, klen, kout; |
204 | int slen; | 204 | u_int slen; |
205 | 205 | ||
206 | /* generate server DH public key */ | 206 | /* generate server DH public key */ |
207 | dh = dh_new_group1(); | 207 | dh = dh_new_group1(); |
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: kexgex.c,v 1.18 2002/02/23 17:59:02 markus Exp $"); | 27 | RCSID("$OpenBSD: kexgex.c,v 1.19 2002/02/24 19:14:59 markus Exp $"); |
28 | 28 | ||
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
30 | 30 | ||
@@ -261,8 +261,8 @@ kexgex_server(Kex *kex) | |||
261 | Key *server_host_key; | 261 | Key *server_host_key; |
262 | DH *dh = dh; | 262 | DH *dh = dh; |
263 | u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; | 263 | u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; |
264 | u_int sbloblen, klen, kout; | 264 | u_int sbloblen, klen, kout, slen; |
265 | int min = -1, max = -1, nbits = -1, type, slen; | 265 | int min = -1, max = -1, nbits = -1, type; |
266 | 266 | ||
267 | if (kex->load_host_key == NULL) | 267 | if (kex->load_host_key == NULL) |
268 | fatal("Cannot load hostkey"); | 268 | fatal("Cannot load hostkey"); |
@@ -32,7 +32,7 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | #include "includes.h" | 34 | #include "includes.h" |
35 | RCSID("$OpenBSD: key.c,v 1.39 2002/01/25 22:07:40 markus Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.40 2002/02/24 19:14:59 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -176,7 +176,7 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) | |||
176 | EVP_MD_CTX ctx; | 176 | EVP_MD_CTX ctx; |
177 | u_char *blob = NULL; | 177 | u_char *blob = NULL; |
178 | u_char *retval = NULL; | 178 | u_char *retval = NULL; |
179 | int len = 0; | 179 | u_int len = 0; |
180 | int nlen, elen; | 180 | int nlen, elen; |
181 | 181 | ||
182 | *dgst_raw_length = 0; | 182 | *dgst_raw_length = 0; |
@@ -488,8 +488,9 @@ key_read(Key *ret, char **cpp) | |||
488 | int | 488 | int |
489 | key_write(Key *key, FILE *f) | 489 | key_write(Key *key, FILE *f) |
490 | { | 490 | { |
491 | int success = 0; | 491 | int n, success = 0; |
492 | u_int bits = 0; | 492 | u_int len, bits = 0; |
493 | u_char *blob, *uu; | ||
493 | 494 | ||
494 | if (key->type == KEY_RSA1 && key->rsa != NULL) { | 495 | if (key->type == KEY_RSA1 && key->rsa != NULL) { |
495 | /* size of modulus 'n' */ | 496 | /* size of modulus 'n' */ |
@@ -503,8 +504,6 @@ key_write(Key *key, FILE *f) | |||
503 | } | 504 | } |
504 | } else if ((key->type == KEY_DSA && key->dsa != NULL) || | 505 | } else if ((key->type == KEY_DSA && key->dsa != NULL) || |
505 | (key->type == KEY_RSA && key->rsa != NULL)) { | 506 | (key->type == KEY_RSA && key->rsa != NULL)) { |
506 | int len, n; | ||
507 | u_char *blob, *uu; | ||
508 | key_to_blob(key, &blob, &len); | 507 | key_to_blob(key, &blob, &len); |
509 | uu = xmalloc(2*len); | 508 | uu = xmalloc(2*len); |
510 | n = uuencode(blob, len, uu, 2*len); | 509 | n = uuencode(blob, len, uu, 2*len); |
@@ -763,8 +762,8 @@ key_to_blob(Key *key, u_char **blobp, u_int *lenp) | |||
763 | int | 762 | int |
764 | key_sign( | 763 | key_sign( |
765 | Key *key, | 764 | Key *key, |
766 | u_char **sigp, int *lenp, | 765 | u_char **sigp, u_int *lenp, |
767 | u_char *data, int datalen) | 766 | u_char *data, u_int datalen) |
768 | { | 767 | { |
769 | switch (key->type) { | 768 | switch (key->type) { |
770 | case KEY_DSA: | 769 | case KEY_DSA: |
@@ -783,8 +782,8 @@ key_sign( | |||
783 | int | 782 | int |
784 | key_verify( | 783 | key_verify( |
785 | Key *key, | 784 | Key *key, |
786 | u_char *signature, int signaturelen, | 785 | u_char *signature, u_int signaturelen, |
787 | u_char *data, int datalen) | 786 | u_char *data, u_int datalen) |
788 | { | 787 | { |
789 | if (signaturelen == 0) | 788 | if (signaturelen == 0) |
790 | return -1; | 789 | return -1; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.h,v 1.17 2001/09/17 19:27:15 stevesk Exp $ */ | 1 | /* $OpenBSD: key.h,v 1.18 2002/02/24 19:14:59 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -74,7 +74,7 @@ int key_to_blob(Key *, u_char **, u_int *); | |||
74 | char *key_ssh_name(Key *); | 74 | char *key_ssh_name(Key *); |
75 | int key_names_valid2(const char *); | 75 | int key_names_valid2(const char *); |
76 | 76 | ||
77 | int key_sign(Key *, u_char **, int *, u_char *, int); | 77 | int key_sign(Key *, u_char **, u_int *, u_char *, u_int); |
78 | int key_verify(Key *, u_char *, int, u_char *, int); | 78 | int key_verify(Key *, u_char *, u_int, u_char *, u_int); |
79 | 79 | ||
80 | #endif | 80 | #endif |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-dss.c,v 1.12 2002/01/25 21:42:11 markus Exp $"); | 26 | RCSID("$OpenBSD: ssh-dss.c,v 1.13 2002/02/24 19:14:59 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/evp.h> | 29 | #include <openssl/evp.h> |
@@ -42,8 +42,8 @@ RCSID("$OpenBSD: ssh-dss.c,v 1.12 2002/01/25 21:42:11 markus Exp $"); | |||
42 | int | 42 | int |
43 | ssh_dss_sign( | 43 | ssh_dss_sign( |
44 | Key *key, | 44 | Key *key, |
45 | u_char **sigp, int *lenp, | 45 | u_char **sigp, u_int *lenp, |
46 | u_char *data, int datalen) | 46 | u_char *data, u_int datalen) |
47 | { | 47 | { |
48 | DSA_SIG *sig; | 48 | DSA_SIG *sig; |
49 | EVP_MD *evp_md = EVP_sha1(); | 49 | EVP_MD *evp_md = EVP_sha1(); |
@@ -106,8 +106,8 @@ ssh_dss_sign( | |||
106 | int | 106 | int |
107 | ssh_dss_verify( | 107 | ssh_dss_verify( |
108 | Key *key, | 108 | Key *key, |
109 | u_char *signature, int signaturelen, | 109 | u_char *signature, u_int signaturelen, |
110 | u_char *data, int datalen) | 110 | u_char *data, u_int datalen) |
111 | { | 111 | { |
112 | DSA_SIG *sig; | 112 | DSA_SIG *sig; |
113 | EVP_MD *evp_md = EVP_sha1(); | 113 | EVP_MD *evp_md = EVP_sha1(); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-dss.h,v 1.5 2001/06/26 17:27:25 markus Exp $ */ | 1 | /* $OpenBSD: ssh-dss.h,v 1.6 2002/02/24 19:14:59 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -26,7 +26,7 @@ | |||
26 | #ifndef DSA_H | 26 | #ifndef DSA_H |
27 | #define DSA_H | 27 | #define DSA_H |
28 | 28 | ||
29 | int ssh_dss_sign(Key *, u_char **, int *, u_char *, int); | 29 | int ssh_dss_sign(Key *, u_char **, u_int *, u_char *, u_int); |
30 | int ssh_dss_verify(Key *, u_char *, int, u_char *, int); | 30 | int ssh_dss_verify(Key *, u_char *, u_int, u_char *, u_int); |
31 | 31 | ||
32 | #endif | 32 | #endif |
diff --git a/ssh-keygen.c b/ssh-keygen.c index ddd03ff5d..4560a3ffe 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.92 2002/02/16 20:40:08 stevesk Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.93 2002/02/24 19:14:59 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -196,7 +196,7 @@ buffer_get_bignum_bits(Buffer *b, BIGNUM *value) | |||
196 | } | 196 | } |
197 | 197 | ||
198 | static Key * | 198 | static Key * |
199 | do_convert_private_ssh2_from_blob(u_char *blob, int blen) | 199 | do_convert_private_ssh2_from_blob(u_char *blob, u_int blen) |
200 | { | 200 | { |
201 | Buffer b; | 201 | Buffer b; |
202 | Key *key = NULL; | 202 | Key *key = NULL; |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.15 2002/01/25 21:42:11 markus Exp $"); | 26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.16 2002/02/24 19:14:59 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | #include <openssl/err.h> | 29 | #include <openssl/err.h> |
@@ -40,8 +40,8 @@ RCSID("$OpenBSD: ssh-rsa.c,v 1.15 2002/01/25 21:42:11 markus Exp $"); | |||
40 | int | 40 | int |
41 | ssh_rsa_sign( | 41 | ssh_rsa_sign( |
42 | Key *key, | 42 | Key *key, |
43 | u_char **sigp, int *lenp, | 43 | u_char **sigp, u_int *lenp, |
44 | u_char *data, int datalen) | 44 | u_char *data, u_int datalen) |
45 | { | 45 | { |
46 | const EVP_MD *evp_md; | 46 | const EVP_MD *evp_md; |
47 | EVP_MD_CTX md; | 47 | EVP_MD_CTX md; |
@@ -110,8 +110,8 @@ ssh_rsa_sign( | |||
110 | int | 110 | int |
111 | ssh_rsa_verify( | 111 | ssh_rsa_verify( |
112 | Key *key, | 112 | Key *key, |
113 | u_char *signature, int signaturelen, | 113 | u_char *signature, u_int signaturelen, |
114 | u_char *data, int datalen) | 114 | u_char *data, u_int datalen) |
115 | { | 115 | { |
116 | Buffer b; | 116 | Buffer b; |
117 | const EVP_MD *evp_md; | 117 | const EVP_MD *evp_md; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-rsa.h,v 1.5 2001/06/26 17:27:25 markus Exp $ */ | 1 | /* $OpenBSD: ssh-rsa.h,v 1.6 2002/02/24 19:14:59 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -26,7 +26,7 @@ | |||
26 | #ifndef SSH_RSA_H | 26 | #ifndef SSH_RSA_H |
27 | #define SSH_RSA_H | 27 | #define SSH_RSA_H |
28 | 28 | ||
29 | int ssh_rsa_sign(Key *, u_char **, int *, u_char *, int); | 29 | int ssh_rsa_sign(Key *, u_char **, u_int *, u_char *, u_int); |
30 | int ssh_rsa_verify(Key *, u_char *, int, u_char *, int); | 30 | int ssh_rsa_verify(Key *, u_char *, u_int, u_char *, u_int); |
31 | 31 | ||
32 | #endif | 32 | #endif |
diff --git a/sshconnect2.c b/sshconnect2.c index ea8cfa6da..374eab570 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.95 2002/02/03 17:59:23 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.96 2002/02/24 19:14:59 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -138,7 +138,7 @@ typedef struct Authmethod Authmethod; | |||
138 | 138 | ||
139 | typedef int sign_cb_fn( | 139 | typedef int sign_cb_fn( |
140 | Authctxt *authctxt, Key *key, | 140 | Authctxt *authctxt, Key *key, |
141 | u_char **sigp, int *lenp, u_char *data, int datalen); | 141 | u_char **sigp, u_int *lenp, u_char *data, u_int datalen); |
142 | 142 | ||
143 | struct Authctxt { | 143 | struct Authctxt { |
144 | const char *server_user; | 144 | const char *server_user; |
@@ -353,8 +353,10 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt) | |||
353 | Authctxt *authctxt = ctxt; | 353 | Authctxt *authctxt = ctxt; |
354 | Key *key = NULL; | 354 | Key *key = NULL; |
355 | Buffer b; | 355 | Buffer b; |
356 | int pktype, alen, blen, sent = 0; | 356 | int pktype, sent = 0; |
357 | char *pkalg, *pkblob, *fp; | 357 | u_int alen, blen; |
358 | char *pkalg, *fp; | ||
359 | u_char *pkblob; | ||
358 | 360 | ||
359 | if (authctxt == NULL) | 361 | if (authctxt == NULL) |
360 | fatal("input_userauth_pk_ok: no authentication context"); | 362 | fatal("input_userauth_pk_ok: no authentication context"); |
@@ -480,7 +482,7 @@ sign_and_send_pubkey(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback) | |||
480 | { | 482 | { |
481 | Buffer b; | 483 | Buffer b; |
482 | u_char *blob, *signature; | 484 | u_char *blob, *signature; |
483 | int bloblen, slen; | 485 | u_int bloblen, slen; |
484 | int skip = 0; | 486 | int skip = 0; |
485 | int ret = -1; | 487 | int ret = -1; |
486 | int have_sig = 1; | 488 | int have_sig = 1; |
@@ -632,8 +634,8 @@ load_identity_file(char *filename) | |||
632 | } | 634 | } |
633 | 635 | ||
634 | static int | 636 | static int |
635 | identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp, | 637 | identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, u_int *lenp, |
636 | u_char *data, int datalen) | 638 | u_char *data, u_int datalen) |
637 | { | 639 | { |
638 | Key *private; | 640 | Key *private; |
639 | int idx, ret; | 641 | int idx, ret; |
@@ -655,15 +657,15 @@ identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp, | |||
655 | } | 657 | } |
656 | 658 | ||
657 | static int | 659 | static int |
658 | agent_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp, | 660 | agent_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, u_int *lenp, |
659 | u_char *data, int datalen) | 661 | u_char *data, u_int datalen) |
660 | { | 662 | { |
661 | return ssh_agent_sign(authctxt->agent, key, sigp, lenp, data, datalen); | 663 | return ssh_agent_sign(authctxt->agent, key, sigp, lenp, data, datalen); |
662 | } | 664 | } |
663 | 665 | ||
664 | static int | 666 | static int |
665 | key_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp, | 667 | key_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, u_int *lenp, |
666 | u_char *data, int datalen) | 668 | u_char *data, u_int datalen) |
667 | { | 669 | { |
668 | return key_sign(key, sigp, lenp, data, datalen); | 670 | return key_sign(key, sigp, lenp, data, datalen); |
669 | } | 671 | } |