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

diff --git a/ssh-dss.c b/ssh-dss.c
index fea1fe2d5..96b1565d2 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-dss.c,v 1.1 2000/11/12 19:50:38 markus Exp $");
+RCSID("$OpenBSD: ssh-dss.c,v 1.2 2000/12/19 23:17:58 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -44,18 +44,18 @@ RCSID("$OpenBSD: ssh-dss.c,v 1.1 2000/11/12 19:50:38 markus Exp $");
 int
 ssh_dss_sign(
     Key *key,
-    unsigned char **sigp, int *lenp,
-    unsigned char *data, int datalen)
+    u_char **sigp, int *lenp,
+    u_char *data, int datalen)
 {
-        unsigned char *digest;
-        unsigned char *ret;
+        u_char *digest;
+        u_char *ret;
         DSA_SIG *sig;
         EVP_MD *evp_md = EVP_sha1();
         EVP_MD_CTX md;
-        unsigned int rlen;
-        unsigned int slen;
-        unsigned int len;
-        unsigned char sigblob[SIGBLOB_LEN];
+        u_int rlen;
+        u_int slen;
+        u_int len;
+        u_char sigblob[SIGBLOB_LEN];
         Buffer b;
 
         if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
@@ -113,17 +113,17 @@ ssh_dss_sign(
 int
 ssh_dss_verify(
     Key *key,
-    unsigned char *signature, int signaturelen,
-    unsigned char *data, int datalen)
+    u_char *signature, int signaturelen,
+    u_char *data, int datalen)
 {
         Buffer b;
-        unsigned char *digest;
+        u_char *digest;
         DSA_SIG *sig;
         EVP_MD *evp_md = EVP_sha1();
         EVP_MD_CTX md;
-        unsigned char *sigblob;
+        u_char *sigblob;
         char *txt;
-        unsigned int len, dlen;
+        u_int len, dlen;
         int rlen;
         int ret;
 
@@ -159,7 +159,7 @@ ssh_dss_verify(
                         buffer_free(&b);
                         return -1;
                 }
-                sigblob = (unsigned char *)buffer_get_string(&b, &len);
+                sigblob = (u_char *)buffer_get_string(&b, &len);
                 rlen = buffer_len(&b);
                 if(rlen != 0) {
                         error("remaining bytes in signature %d", rlen);