=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfd.c,v retrieving revision 1.66.2.1 retrieving revision 1.67 diff -u -r1.66.2.1 -r1.67 --- src/usr.bin/ssh/authfd.c 2006/10/06 03:19:32 1.66.2.1 +++ src/usr.bin/ssh/authfd.c 2006/02/20 16:36:14 1.67 @@ -1,4 +1,3 @@ -/* $OpenBSD: authfd.c,v 1.66.2.1 2006/10/06 03:19:32 brad Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,24 +34,20 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "includes.h" +RCSID("$OpenBSD: authfd.c,v 1.67 2006/02/20 16:36:14 stevesk Exp $"); #include #include -#include #include -#include -#include -#include -#include -#include -#include - -#include "xmalloc.h" #include "ssh.h" #include "rsa.h" #include "buffer.h" +#include "bufaux.h" +#include "xmalloc.h" +#include "getput.h" #include "key.h" #include "authfd.h" #include "cipher.h" @@ -60,7 +55,6 @@ #include "compat.h" #include "log.h" #include "atomicio.h" -#include "misc.h" static int agent_present = 0; @@ -112,7 +106,7 @@ close(sock); return -1; } - if (connect(sock, (struct sockaddr *)&sunaddr, sizeof sunaddr) < 0) { + if (connect(sock, (struct sockaddr *) &sunaddr, sizeof sunaddr) < 0) { close(sock); return -1; } @@ -128,7 +122,7 @@ /* Get the length of the message, and format it in the buffer. */ len = buffer_len(request); - put_u32(buf, len); + PUT_32BIT(buf, len); /* Send the length and then the packet to the agent. */ if (atomicio(vwrite, auth->fd, buf, 4) != 4 || @@ -147,7 +141,7 @@ } /* Extract the length, and check it for sanity. */ - len = get_u32(buf); + len = GET_32BIT(buf); if (len > 256 * 1024) fatal("Authentication response too long: %u", len); @@ -344,6 +338,7 @@ break; default: return NULL; + break; } /* Decrement the number of remaining entries. */ auth->howmany--; @@ -402,7 +397,7 @@ * fatal error if the packet is corrupt. */ for (i = 0; i < 16; i++) - response[i] = (u_char)buffer_get_char(&buffer); + response[i] = buffer_get_char(&buffer); } buffer_free(&buffer); return success; @@ -525,6 +520,7 @@ default: buffer_free(&msg); return 0; + break; } if (constrained) { if (life != 0) {