- 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@

diff --git a/ChangeLog b/ChangeLog
index 4dc74b0649e583231a5f7e0c63c6f19c9190a389..86684ca2cb3b15eb208beed49e48a5075ad52a38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -204,6 +204,9 @@
    - stevesk@cvs.openbsd.org 2002/01/18 17:14:16
      [sshd.8]
      correct Ciphers default; paola.mannaro@ubs.com
+   - 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@
 
 20020121
  - (djm) Rework ssh-rand-helper:

diff --git a/authfd.c b/authfd.c
index c66ce4199798cbe5a9652cbc55e764f0e072b1dd..f90676cca46a167b1b9f26e2630c0d1ce7fc1f43 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.46 2001/12/05 10:06:12 deraadt Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.47 2002/01/18 18:14:17 stevesk Exp $");
 
 #include <openssl/evp.h>
 
@@ -344,7 +344,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
        buffer_put_bignum(&buffer, key->rsa->e);
        buffer_put_bignum(&buffer, key->rsa->n);
        buffer_put_bignum(&buffer, challenge);
-       buffer_append(&buffer, (char *) session_id, 16);
+       buffer_append(&buffer, session_id, 16);
        buffer_put_int(&buffer, response_type);
 
        if (ssh_request_reply(auth, &buffer, &buffer) == 0) {

diff --git a/bufaux.c b/bufaux.c
index 9f0ab6b17879d5f82f34570b5116425ecdaaa4d3..23bc0c814d229cd685fd3952d5028b542362eb60 100644 (file)
--- a/bufaux.c
+++ b/bufaux.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: bufaux.c,v 1.21 2001/12/28 14:13:13 markus Exp $");
+RCSID("$OpenBSD: bufaux.c,v 1.22 2002/01/18 18:14:17 stevesk Exp $");
 
 #include <openssl/bn.h>
 #include "bufaux.h"
@@ -90,7 +90,7 @@ buffer_get_bignum(Buffer *buffer, BIGNUM *value)
        bytes = (bits + 7) / 8;
        if (buffer_len(buffer) < bytes)
                fatal("buffer_get_bignum: input buffer too small");
-       bin = (u_char *) buffer_ptr(buffer);
+       bin = buffer_ptr(buffer);
        BN_bin2bn(bin, bytes, value);
        buffer_consume(buffer, bytes);
 }
@@ -133,7 +133,7 @@ buffer_get_bignum2(Buffer *buffer, BIGNUM *value)
 {
        /**XXX should be two's-complement */
        int len;
-       u_char *bin = (u_char *)buffer_get_string(buffer, (u_int *)&len);
+       u_char *bin = buffer_get_string(buffer, (u_int *)&len);
        BN_bin2bn(bin, len, value);
        xfree(bin);
 }

diff --git a/buffer.c b/buffer.c
index a1152d1d6f56567f81fff3b34b95f9661714bc4b..40572e5ac30e5c4e5e6ee8ced39b025377b78a8f 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.14 2001/12/19 17:16:13 stevesk Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -155,7 +155,7 @@ void
 buffer_dump(Buffer *buffer)
 {
        int i;
-       u_char *ucp = (u_char *) buffer->buf;
+       u_char *ucp = buffer->buf;
 
        for (i = buffer->offset; i < buffer->end; i++) {
                fprintf(stderr, "%02x", ucp[i]);

diff --git a/cipher.c b/cipher.c
index c02b35161b0ec35c711a14c32afa7e90815a1e90..2186d88ec027c4652d6b887142db7b21322d68fa 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.48 2001/12/19 07:18:56 deraadt Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.49 2002/01/18 18:14:17 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -308,7 +308,7 @@ rijndael_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src,
        if (len % RIJNDAEL_BLOCKSIZE)
                fatal("rijndael_cbc_encrypt: bad len %d", len);
        cnow  = dest;
-       plain = (u_char *) src;
+       plain = (u_char *)src;
        cprev = iv;
        for (i = 0; i < blocks; i++, plain+=RIJNDAEL_BLOCKSIZE,
            cnow+=RIJNDAEL_BLOCKSIZE) {

diff --git a/packet.c b/packet.c
index 3b3faeeaf3e9f8783873c96fcabea81a5ae268b4..960675a936da584d77f1978999acd472fc968a00 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.84 2002/01/11 10:31:05 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.85 2002/01/18 18:14:17 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -130,8 +130,8 @@ packet_set_connection(int fd_in, int fd_out)
                fatal("packet_set_connection: cannot load cipher 'none'");
        connection_in = fd_in;
        connection_out = fd_out;
-       cipher_init(&send_context, none, (u_char *) "", 0, NULL, 0);
-       cipher_init(&receive_context, none, (u_char *) "", 0, NULL, 0);
+       cipher_init(&send_context, none, "", 0, NULL, 0);
+       cipher_init(&receive_context, none, "", 0, NULL, 0);
        newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL;
        if (!initialized) {
                initialized = 1;

diff --git a/ssh-agent.c b/ssh-agent.c
index 84cff1282a9a654470cc64f197a7df8c2179bb21..5264c23a88d34bd35e4e29c0861f2e0dd97a4b4a 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh-agent.c,v 1.78 2002/01/13 17:27:07 provos Exp $   */
+/*     $OpenBSD: ssh-agent.c,v 1.79 2002/01/18 18:14:17 stevesk Exp $  */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,7 +37,7 @@
 
 #include "includes.h"
 #include <sys/queue.h>
-RCSID("$OpenBSD: ssh-agent.c,v 1.78 2002/01/13 17:27:07 provos Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.79 2002/01/18 18:14:17 stevesk Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -205,7 +205,7 @@ process_authentication_challenge1(SocketEntry *e)
        /* Only protocol 1.1 is supported */
        if (buffer_len(&e->input) == 0)
                goto failure;
-       buffer_get(&e->input, (char *) session_id, 16);
+       buffer_get(&e->input, session_id, 16);
        response_type = buffer_get_int(&e->input);
        if (response_type != 1)
                goto failure;

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 07d4cff552165753b75fb69b1580869df577e7d3..49137fbeb51eb589ded03c93a3900b7a83af2276 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.90 2002/01/09 13:49:27 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.91 2002/01/18 18:14:17 stevesk Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -332,7 +332,7 @@ do_convert_from_ssh2(struct passwd *pw)
                *p = '\0';
                strlcat(encoded, line, sizeof(encoded));
        }
-       blen = uudecode(encoded, (u_char *)blob, sizeof(blob));
+       blen = uudecode(encoded, blob, sizeof(blob));
        if (blen < 0) {
                fprintf(stderr, "uudecode failed.\n");
                exit(1);