From 46c162204b5a6f7471525c2f75cb2c607c88b83f Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 22 Dec 2000 01:43:59 +0000 Subject: One way to massive patch. 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. --- ssh-rsa.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'ssh-rsa.c') diff --git a/ssh-rsa.c b/ssh-rsa.c index cc31154d9..0f44051bc 100644 --- a/ssh-rsa.c +++ b/ssh-rsa.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-rsa.c,v 1.1 2000/11/12 19:50:38 markus Exp $"); +RCSID("$OpenBSD: ssh-rsa.c,v 1.2 2000/12/19 23:17:58 markus Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -44,13 +44,13 @@ RCSID("$OpenBSD: ssh-rsa.c,v 1.1 2000/11/12 19:50:38 markus Exp $"); int ssh_rsa_sign( Key *key, - unsigned char **sigp, int *lenp, - unsigned char *data, int datalen) + u_char **sigp, int *lenp, + u_char *data, int datalen) { EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; - unsigned char *digest, *sig, *ret; - unsigned int slen, dlen, len; + u_char *digest, *sig, *ret; + u_int slen, dlen, len; int ok; Buffer b; @@ -109,15 +109,15 @@ ssh_rsa_sign( int ssh_rsa_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; EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; char *ktype; - unsigned char *sigblob, *digest; - unsigned int len, dlen; + u_char *sigblob, *digest; + u_int len, dlen; int rlen; int ret; @@ -135,7 +135,7 @@ ssh_rsa_verify( return -1; } xfree(ktype); - sigblob = (unsigned char *)buffer_get_string(&b, &len); + sigblob = (u_char *)buffer_get_string(&b, &len); rlen = buffer_len(&b); buffer_free(&b); if(rlen != 0) { -- cgit v1.2.3