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

And I think I have all the bits right from the OpenBSD tree.
20001222
 - Updated RCSID for pty.c
 - (bal) OpenBSD CVS Updates:
  - markus@cvs.openbsd.org 2000/12/21 15:10:16
    [auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
    print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
  - markus@cvs.openbsd.org 2000/12/20 19:26:56
    [authfile.c]
    allow ssh -i userkey for root
  - markus@cvs.openbsd.org 2000/12/20 19:37:21
    [authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
    fix prototypes; from stevesk@pobox.com
  - markus@cvs.openbsd.org 2000/12/20 19:32:08
    [sshd.c]
    init pointer to NULL; report from Jan.Ivan@cern.ch
  - markus@cvs.openbsd.org 2000/12/19 23:17:54
    [auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
     auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
     bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
     crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
     key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
     packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
     serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
     ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h  uuencode.c
     uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
    replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
    unsigned' with u_char.

1 files changed, 16 insertions, 16 deletions

diff --git a/sshconnect1.c b/sshconnect1.c
index f95c031da..d6230529f 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.12 2000/12/10 17:01:53 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.13 2000/12/19 23:17:58 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
@@ -34,8 +34,8 @@ RCSID("$OpenBSD: sshconnect1.c,v 1.12 2000/12/10 17:01:53 markus Exp $");
 #include "authfile.h"
 
 /* Session id for the current session. */
-unsigned char session_id[16];
-unsigned int supported_authentications = 0;
+u_char session_id[16];
+u_int supported_authentications = 0;
 
 extern Options options;
 extern char *__progname;
@@ -50,8 +50,8 @@ try_agent_authentication()
         int type;
         char *comment;
         AuthenticationConnection *auth;
-        unsigned char response[16];
-        unsigned int i;
+        u_char response[16];
+        u_int i;
         int plen, clen;
         Key *key;
         BIGNUM *challenge;
@@ -146,7 +146,7 @@ try_agent_authentication()
 void
 respond_to_rsa_challenge(BIGNUM * challenge, RSA * prv)
 {
-        unsigned char buf[32], response[16];
+        u_char buf[32], response[16];
         MD5_CTX md;
         int i, len;
 
@@ -441,7 +441,7 @@ try_kerberos_authentication()
                 debug("Kerberos V4 authentication accepted.");
 
                 /* Get server's response. */
-                reply = packet_get_string((unsigned int *) &auth.length);
+                reply = packet_get_string((u_int *) &auth.length);
                 memcpy(auth.dat, reply, auth.length);
                 xfree(reply);
 
@@ -506,7 +506,7 @@ send_kerberos_tgt()
                 debug("Kerberos V4 ticket expired: %s", TKT_FILE);
                 return 0;
         }
-        creds_to_radix(creds, (unsigned char *)buffer, sizeof buffer);
+        creds_to_radix(creds, (u_char *)buffer, sizeof buffer);
         xfree(creds);
 
         packet_start(SSH_CMSG_HAVE_KERBEROS_TGT);
@@ -545,10 +545,10 @@ send_afs_tokens(void)
                 p = buf;
 
                 /* Get secret token. */
-                memcpy(&creds.ticket_st.length, p, sizeof(unsigned int));
+                memcpy(&creds.ticket_st.length, p, sizeof(u_int));
                 if (creds.ticket_st.length > MAX_KTXT_LEN)
                         break;
-                p += sizeof(unsigned int);
+                p += sizeof(u_int);
                 memcpy(creds.ticket_st.dat, p, creds.ticket_st.length);
                 p += creds.ticket_st.length;
 
@@ -574,7 +574,7 @@ send_afs_tokens(void)
                 creds.pinst[0] = '\0';
 
                 /* Encode token, ship it off. */
-                if (creds_to_radix(&creds, (unsigned char*) buffer, sizeof buffer) <= 0)
+                if (creds_to_radix(&creds, (u_char*) buffer, sizeof buffer) <= 0)
                         break;
                 packet_start(SSH_CMSG_HAVE_AFS_TOKEN);
                 packet_put_string(buffer, strlen(buffer));
@@ -603,7 +603,7 @@ try_skey_authentication()
 {
         int type, i;
         int payload_len;
-        unsigned int clen;
+        u_int clen;
         char prompt[1024];
         char *challenge, *response;
 
@@ -702,10 +702,10 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
         Key k;
         int bits, rbits;
         int ssh_cipher_default = SSH_CIPHER_3DES;
-        unsigned char session_key[SSH_SESSION_KEY_LENGTH];
-        unsigned char cookie[8];
-        unsigned int supported_ciphers;
-        unsigned int server_flags, client_flags;
+        u_char session_key[SSH_SESSION_KEY_LENGTH];
+        u_char cookie[8];
+        u_int supported_ciphers;
+        u_int server_flags, client_flags;
         int payload_len, clen, sum_len = 0;
         u_int32_t rand = 0;