- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / authfd.c

diff --git a/authfd.c b/authfd.c
index a3f22cfc7c6513123fbc133b403435b9c68d57f7..78a53c7a621d858d3ec3bb44db16b562fb822108 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: authfd.c,v 1.81 2009/08/27 17:44:52 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,15 +39,22 @@
 
 #include <sys/types.h>
 #include <sys/un.h>
+#include <sys/socket.h>
 
 #include <openssl/evp.h>
 
+#include <openssl/crypto.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+
+#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"
@@ -54,6 +62,7 @@
 #include "compat.h"
 #include "log.h"
 #include "atomicio.h"
+#include "misc.h"
 
 static int agent_present = 0;
 
@@ -105,7 +114,7 @@ ssh_get_authentication_socket(void)
                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;
        }
@@ -121,7 +130,7 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply
 
        /* 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 ||
@@ -140,7 +149,7 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply
        }
 
        /* 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);
 
@@ -337,7 +346,6 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
                break;
        default:
                return NULL;
-               break;
        }
        /* Decrement the number of remaining entries. */
        auth->howmany--;
@@ -396,7 +404,7 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
                 * 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;
@@ -519,7 +527,6 @@ ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
        default:
                buffer_free(&msg);
                return 0;
-               break;
        }
        if (constrained) {
                if (life != 0) {
@@ -538,12 +545,6 @@ ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
        return decode_reply(type);
 }
 
-int
-ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
-{
-       return ssh_add_identity_constrained(auth, key, comment, 0, 0);
-}
-
 /*
  * Removes an identity from the authentication server.  This call is not
  * meant to be used by normal applications.