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, 5 insertions, 5 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 89c03d901..533cf192e 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.35 2000/11/25 17:19:33 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.36 2000/12/19 23:17:58 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -137,7 +137,7 @@ do_convert_to_ssh2(struct passwd *pw)
 {
         Key *k;
         int len;
-        unsigned char *blob;
+        u_char *blob;
         struct stat st;
 
         if (!have_identity)
@@ -171,7 +171,7 @@ buffer_get_bignum_bits(Buffer *b, BIGNUM *value)
         int bytes = (bits + 7) / 8;
         if (buffer_len(b) < bytes)
                 fatal("buffer_get_bignum_bits: input buffer too small");
-        BN_bin2bn((unsigned char *)buffer_ptr(b), bytes, value);
+        BN_bin2bn((u_char *)buffer_ptr(b), bytes, value);
         buffer_consume(b, bytes);
 }
 
@@ -275,7 +275,7 @@ do_convert_from_ssh2(struct passwd *pw)
                 *p = '\0';
                 strlcat(encoded, line, sizeof(encoded));
         }
-        blen = uudecode(encoded, (unsigned char *)blob, sizeof(blob));
+        blen = uudecode(encoded, (u_char *)blob, sizeof(blob));
         if (blen < 0) {
                 fprintf(stderr, "uudecode failed.\n");
                 exit(1);
@@ -332,7 +332,7 @@ do_fingerprint(struct passwd *pw)
         Key *public;
         char *comment = NULL, *cp, *ep, line[16*1024];
         int i, skip = 0, num = 1, invalid = 1, success = 0;
-        unsigned int ignore;
+        u_int ignore;
         struct stat st;
 
         if (!have_identity)