diff options
author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:33:31 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:33:31 +1100 |
commit | 4a8ed543612c99700788d87fe18081d5df4b37c6 (patch) | |
tree | 3a102ce09b19c658de9bdb28e0e449261d15db9e | |
parent | 9c3f9505d9401a7af93098a59f3979e4608cde50 (diff) |
- stevesk@cvs.openbsd.org 2002/01/18 18:14:17
[authfd.c bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c]
unneeded cast cleanup; ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | authfd.c | 4 | ||||
-rw-r--r-- | bufaux.c | 6 | ||||
-rw-r--r-- | buffer.c | 4 | ||||
-rw-r--r-- | cipher.c | 4 | ||||
-rw-r--r-- | packet.c | 6 | ||||
-rw-r--r-- | ssh-agent.c | 6 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
8 files changed, 21 insertions, 18 deletions
@@ -204,6 +204,9 @@ | |||
204 | - stevesk@cvs.openbsd.org 2002/01/18 17:14:16 | 204 | - stevesk@cvs.openbsd.org 2002/01/18 17:14:16 |
205 | [sshd.8] | 205 | [sshd.8] |
206 | correct Ciphers default; paola.mannaro@ubs.com | 206 | correct Ciphers default; paola.mannaro@ubs.com |
207 | - stevesk@cvs.openbsd.org 2002/01/18 18:14:17 | ||
208 | [authfd.c bufaux.c buffer.c cipher.c packet.c ssh-agent.c ssh-keygen.c] | ||
209 | unneeded cast cleanup; ok markus@ | ||
207 | 210 | ||
208 | 20020121 | 211 | 20020121 |
209 | - (djm) Rework ssh-rand-helper: | 212 | - (djm) Rework ssh-rand-helper: |
@@ -7351,4 +7354,4 @@ | |||
7351 | - Wrote replacements for strlcpy and mkdtemp | 7354 | - Wrote replacements for strlcpy and mkdtemp |
7352 | - Released 1.0pre1 | 7355 | - Released 1.0pre1 |
7353 | 7356 | ||
7354 | $Id: ChangeLog,v 1.1780 2002/01/22 12:33:15 djm Exp $ | 7357 | $Id: ChangeLog,v 1.1781 2002/01/22 12:33:31 djm Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.46 2001/12/05 10:06:12 deraadt Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.47 2002/01/18 18:14:17 stevesk Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -344,7 +344,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth, | |||
344 | buffer_put_bignum(&buffer, key->rsa->e); | 344 | buffer_put_bignum(&buffer, key->rsa->e); |
345 | buffer_put_bignum(&buffer, key->rsa->n); | 345 | buffer_put_bignum(&buffer, key->rsa->n); |
346 | buffer_put_bignum(&buffer, challenge); | 346 | buffer_put_bignum(&buffer, challenge); |
347 | buffer_append(&buffer, (char *) session_id, 16); | 347 | buffer_append(&buffer, session_id, 16); |
348 | buffer_put_int(&buffer, response_type); | 348 | buffer_put_int(&buffer, response_type); |
349 | 349 | ||
350 | if (ssh_request_reply(auth, &buffer, &buffer) == 0) { | 350 | if (ssh_request_reply(auth, &buffer, &buffer) == 0) { |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: bufaux.c,v 1.21 2001/12/28 14:13:13 markus Exp $"); | 40 | RCSID("$OpenBSD: bufaux.c,v 1.22 2002/01/18 18:14:17 stevesk Exp $"); |
41 | 41 | ||
42 | #include <openssl/bn.h> | 42 | #include <openssl/bn.h> |
43 | #include "bufaux.h" | 43 | #include "bufaux.h" |
@@ -90,7 +90,7 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value) | |||
90 | bytes = (bits + 7) / 8; | 90 | bytes = (bits + 7) / 8; |
91 | if (buffer_len(buffer) < bytes) | 91 | if (buffer_len(buffer) < bytes) |
92 | fatal("buffer_get_bignum: input buffer too small"); | 92 | fatal("buffer_get_bignum: input buffer too small"); |
93 | bin = (u_char *) buffer_ptr(buffer); | 93 | bin = buffer_ptr(buffer); |
94 | BN_bin2bn(bin, bytes, value); | 94 | BN_bin2bn(bin, bytes, value); |
95 | buffer_consume(buffer, bytes); | 95 | buffer_consume(buffer, bytes); |
96 | } | 96 | } |
@@ -133,7 +133,7 @@ buffer_get_bignum2(Buffer *buffer, BIGNUM *value) | |||
133 | { | 133 | { |
134 | /**XXX should be two's-complement */ | 134 | /**XXX should be two's-complement */ |
135 | int len; | 135 | int len; |
136 | u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len); | 136 | u_char *bin = buffer_get_string(buffer, (u_int *)&len); |
137 | BN_bin2bn(bin, len, value); | 137 | BN_bin2bn(bin, len, value); |
138 | xfree(bin); | 138 | xfree(bin); |
139 | } | 139 | } |
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: buffer.c,v 1.14 2001/12/19 17:16:13 stevesk Exp $"); | 15 | RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $"); |
16 | 16 | ||
17 | #include "xmalloc.h" | 17 | #include "xmalloc.h" |
18 | #include "buffer.h" | 18 | #include "buffer.h" |
@@ -155,7 +155,7 @@ void | |||
155 | buffer_dump(Buffer *buffer) | 155 | buffer_dump(Buffer *buffer) |
156 | { | 156 | { |
157 | int i; | 157 | int i; |
158 | u_char *ucp = (u_char *) buffer->buf; | 158 | u_char *ucp = buffer->buf; |
159 | 159 | ||
160 | for (i = buffer->offset; i < buffer->end; i++) { | 160 | for (i = buffer->offset; i < buffer->end; i++) { |
161 | fprintf(stderr, "%02x", ucp[i]); | 161 | fprintf(stderr, "%02x", ucp[i]); |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.48 2001/12/19 07:18:56 deraadt Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.49 2002/01/18 18:14:17 stevesk Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -308,7 +308,7 @@ rijndael_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src, | |||
308 | if (len % RIJNDAEL_BLOCKSIZE) | 308 | if (len % RIJNDAEL_BLOCKSIZE) |
309 | fatal("rijndael_cbc_encrypt: bad len %d", len); | 309 | fatal("rijndael_cbc_encrypt: bad len %d", len); |
310 | cnow = dest; | 310 | cnow = dest; |
311 | plain = (u_char *) src; | 311 | plain = (u_char *)src; |
312 | cprev = iv; | 312 | cprev = iv; |
313 | for (i = 0; i < blocks; i++, plain+=RIJNDAEL_BLOCKSIZE, | 313 | for (i = 0; i < blocks; i++, plain+=RIJNDAEL_BLOCKSIZE, |
314 | cnow+=RIJNDAEL_BLOCKSIZE) { | 314 | cnow+=RIJNDAEL_BLOCKSIZE) { |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.84 2002/01/11 10:31:05 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.85 2002/01/18 18:14:17 stevesk Exp $"); |
41 | 41 | ||
42 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
43 | #include "buffer.h" | 43 | #include "buffer.h" |
@@ -130,8 +130,8 @@ packet_set_connection(int fd_in, int fd_out) | |||
130 | fatal("packet_set_connection: cannot load cipher 'none'"); | 130 | fatal("packet_set_connection: cannot load cipher 'none'"); |
131 | connection_in = fd_in; | 131 | connection_in = fd_in; |
132 | connection_out = fd_out; | 132 | connection_out = fd_out; |
133 | cipher_init(&send_context, none, (u_char *) "", 0, NULL, 0); | 133 | cipher_init(&send_context, none, "", 0, NULL, 0); |
134 | cipher_init(&receive_context, none, (u_char *) "", 0, NULL, 0); | 134 | cipher_init(&receive_context, none, "", 0, NULL, 0); |
135 | newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; | 135 | newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL; |
136 | if (!initialized) { | 136 | if (!initialized) { |
137 | initialized = 1; | 137 | initialized = 1; |
diff --git a/ssh-agent.c b/ssh-agent.c index 84cff1282..5264c23a8 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.78 2002/01/13 17:27:07 provos Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.79 2002/01/18 18:14:17 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | #include <sys/queue.h> | 39 | #include <sys/queue.h> |
40 | RCSID("$OpenBSD: ssh-agent.c,v 1.78 2002/01/13 17:27:07 provos Exp $"); | 40 | RCSID("$OpenBSD: ssh-agent.c,v 1.79 2002/01/18 18:14:17 stevesk Exp $"); |
41 | 41 | ||
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
43 | #include <openssl/md5.h> | 43 | #include <openssl/md5.h> |
@@ -205,7 +205,7 @@ process_authentication_challenge1(SocketEntry *e) | |||
205 | /* Only protocol 1.1 is supported */ | 205 | /* Only protocol 1.1 is supported */ |
206 | if (buffer_len(&e->input) == 0) | 206 | if (buffer_len(&e->input) == 0) |
207 | goto failure; | 207 | goto failure; |
208 | buffer_get(&e->input, (char *) session_id, 16); | 208 | buffer_get(&e->input, session_id, 16); |
209 | response_type = buffer_get_int(&e->input); | 209 | response_type = buffer_get_int(&e->input); |
210 | if (response_type != 1) | 210 | if (response_type != 1) |
211 | goto failure; | 211 | goto failure; |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 07d4cff55..49137fbeb 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.90 2002/01/09 13:49:27 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.91 2002/01/18 18:14:17 stevesk Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -332,7 +332,7 @@ do_convert_from_ssh2(struct passwd *pw) | |||
332 | *p = '\0'; | 332 | *p = '\0'; |
333 | strlcat(encoded, line, sizeof(encoded)); | 333 | strlcat(encoded, line, sizeof(encoded)); |
334 | } | 334 | } |
335 | blen = uudecode(encoded, (u_char *)blob, sizeof(blob)); | 335 | blen = uudecode(encoded, blob, sizeof(blob)); |
336 | if (blen < 0) { | 336 | if (blen < 0) { |
337 | fprintf(stderr, "uudecode failed.\n"); | 337 | fprintf(stderr, "uudecode failed.\n"); |
338 | exit(1); | 338 | exit(1); |