One way to massive patch. <sigh> It compiles and works under Linux..

[openssh.git] / authfd.c

diff --git a/authfd.c b/authfd.c
index 9036a8d899ab619e251ad421d7d125108c941ab1..e2456e39eee3f0a794569983c5cd1b0e0684a104 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.30 2000/11/12 19:50:37 markus Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.32 2000/12/20 19:37:21 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -62,7 +62,7 @@ int   decode_reply(int type);
 /* Returns the number of the authentication fd, or -1 if there is none. */
 
 int
-ssh_get_authentication_socket()
+ssh_get_authentication_socket(void)
 {
        const char *authsocket;
        int sock, len;
@@ -171,7 +171,7 @@ ssh_close_authentication_socket(int sock)
  */
 
 AuthenticationConnection *
-ssh_get_authentication_connection()
+ssh_get_authentication_connection(void)
 {
        AuthenticationConnection *auth;
        int sock;
@@ -272,9 +272,9 @@ ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int versi
 Key *
 ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version)
 {
-       unsigned int bits;
-       unsigned char *blob;
-       unsigned int blen;
+       u_int bits;
+       u_char *blob;
+       u_int blen;
        Key *key = NULL;
 
        /* Return failure if no more entries. */
@@ -322,9 +322,9 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
 int
 ssh_decrypt_challenge(AuthenticationConnection *auth,
     Key* key, BIGNUM *challenge,
-    unsigned char session_id[16],
-    unsigned int response_type,
-    unsigned char response[16])
+    u_char session_id[16],
+    u_int response_type,
+    u_char response[16])
 {
        Buffer buffer;
        int success = 0;
@@ -373,13 +373,13 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
 int
 ssh_agent_sign(AuthenticationConnection *auth,
     Key *key,
-    unsigned char **sigp, int *lenp,
-    unsigned char *data, int datalen)
+    u_char **sigp, int *lenp,
+    u_char *data, int datalen)
 {
        extern int datafellows;
        Buffer msg;
-       unsigned char *blob;
-       unsigned int blen;
+       u_char *blob;
+       u_int blen;
        int type, flags = 0;
        int ret = -1;
 
@@ -502,8 +502,8 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
 {
        Buffer msg;
        int type;
-       unsigned char *blob;
-       unsigned int blen;
+       u_char *blob;
+       u_int blen;
 
        buffer_init(&msg);