- markus@cvs.openbsd.org 2002/06/24 14:55:38

     [authfile.c kex.c ssh-agent.c]
     cat to (void) when output from buffer_get_X is ignored

diff --git a/ChangeLog b/ChangeLog
index 15adbdbc918392ce536d7cd80a27ab712258b2c3..cf75ba1c76ccc9e67a596fea91334947be29ca2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
    - markus@cvs.openbsd.org 2002/06/24 14:33:27
      [channels.c channels.h clientloop.c serverloop.c]
      move channel counter to u_int
+   - markus@cvs.openbsd.org 2002/06/24 14:55:38
+     [authfile.c kex.c ssh-agent.c]
+     cat to (void) when output from buffer_get_X is ignored
 
 20020625
  - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh

diff --git a/authfile.c b/authfile.c
index 6d936de56e39e76f913bfa4b88887b3c24a1b266..1fa5d811ae314e8d44509997f7149b5f0edb24bf 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.49 2002/05/23 19:24:30 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.50 2002/06/24 14:55:38 markus Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -270,7 +270,7 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
        (void) buffer_get_int(&buffer);         /* reserved */
 
        /* Read the public key from the buffer. */
-       buffer_get_int(&buffer);
+       (void) buffer_get_int(&buffer);
        pub = key_new(KEY_RSA1);
        buffer_get_bignum(&buffer, pub->rsa->n);
        buffer_get_bignum(&buffer, pub->rsa->e);
@@ -357,7 +357,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
        (void) buffer_get_int(&buffer); /* Reserved data. */
 
        /* Read the public key from the buffer. */
-       buffer_get_int(&buffer);
+       (void) buffer_get_int(&buffer);
        prv = key_new_private(KEY_RSA1);
 
        buffer_get_bignum(&buffer, prv->rsa->n);

diff --git a/kex.c b/kex.c
index d079ab0e388a98e83e4cbb79d89543ed068ec9de..bdbf3882c82b3d0e3505418b488e21b0637f4055 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.50 2002/05/15 15:47:49 mouring Exp $");
+RCSID("$OpenBSD: kex.c,v 1.51 2002/06/24 14:55:38 markus Exp $");
 
 #include <openssl/crypto.h>
 
@@ -202,8 +202,8 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
                packet_get_char();
        for (i = 0; i < PROPOSAL_MAX; i++)
                xfree(packet_get_string(NULL));
-       packet_get_char();
-       packet_get_int();
+       (void) packet_get_char();
+       (void) packet_get_int();
        packet_check_eom();
 
        kex_kexinit_finish(kex);

diff --git a/ssh-agent.c b/ssh-agent.c
index b3558b2580c0dc4b2d8ef07e4def13ad3f6c84ca..ac16bae40aa59307d76a0a0b4600fb6f6d02c19f 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
 
 #include "includes.h"
 #include "openbsd-compat/fake-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.96 2002/06/23 10:29:52 deraadt Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.97 2002/06/24 14:55:38 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -197,7 +197,7 @@ process_authentication_challenge1(SocketEntry *e)
        if ((challenge = BN_new()) == NULL)
                fatal("process_authentication_challenge1: BN_new failed");
 
-       buffer_get_int(&e->request);                            /* ignored */
+       (void) buffer_get_int(&e->request);                     /* ignored */
        buffer_get_bignum(&e->request, key->rsa->e);
        buffer_get_bignum(&e->request, key->rsa->n);
        buffer_get_bignum(&e->request, challenge);
@@ -398,7 +398,7 @@ process_add_identity(SocketEntry *e, int version)
        switch (version) {
        case 1:
                k = key_new_private(KEY_RSA1);
-               buffer_get_int(&e->request);                    /* ignored */
+               (void) buffer_get_int(&e->request);             /* ignored */
                buffer_get_bignum(&e->request, k->rsa->n);
                buffer_get_bignum(&e->request, k->rsa->e);
                buffer_get_bignum(&e->request, k->rsa->d);