+/* $OpenBSD: authfd.c,v 1.78 2006/07/22 20:48:22 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
#include <sys/types.h>
#include <sys/un.h>
+#include <sys/socket.h>
#include <openssl/evp.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.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"
#include "compat.h"
#include "log.h"
#include "atomicio.h"
+#include "misc.h"
static int agent_present = 0;
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;
}
/* Get the length of the message, and format it in the buffer. */
len = buffer_len(request);
- PUT_32BIT(buf, len);
+ put_u32(buf, len);
/* Send the length and then the packet to the agent. */
if (atomicio(vwrite, auth->fd, buf, 4) != 4 ||
}
/* Extract the length, and check it for sanity. */
- len = GET_32BIT(buf);
+ len = get_u32(buf);
if (len > 256 * 1024)
fatal("Authentication response too long: %u", len);
break;
default:
return NULL;
- break;
}
/* Decrement the number of remaining entries. */
auth->howmany--;
* fatal error if the packet is corrupt.
*/
for (i = 0; i < 16; i++)
- response[i] = buffer_get_char(&buffer);
+ response[i] = (u_char)buffer_get_char(&buffer);
}
buffer_free(&buffer);
return success;
default:
buffer_free(&msg);
return 0;
- break;
}
if (constrained) {
if (life != 0) {