diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 01:43:59 +0000 |
commit | 46c162204b5a6f7471525c2f75cb2c607c88b83f (patch) | |
tree | 9041b006ab612c18bdb16b606601839a00ca5b2c /ssh-rsa.c | |
parent | a074feb65d6f1fcad02e80b751e2287fd6230b09 (diff) |
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.
Diffstat (limited to 'ssh-rsa.c')
-rw-r--r-- | ssh-rsa.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.1 2000/11/12 19:50:38 markus Exp $"); | 26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.2 2000/12/19 23:17:58 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -44,13 +44,13 @@ RCSID("$OpenBSD: ssh-rsa.c,v 1.1 2000/11/12 19:50:38 markus Exp $"); | |||
44 | int | 44 | int |
45 | ssh_rsa_sign( | 45 | ssh_rsa_sign( |
46 | Key *key, | 46 | Key *key, |
47 | unsigned char **sigp, int *lenp, | 47 | u_char **sigp, int *lenp, |
48 | unsigned char *data, int datalen) | 48 | u_char *data, int datalen) |
49 | { | 49 | { |
50 | EVP_MD *evp_md = EVP_sha1(); | 50 | EVP_MD *evp_md = EVP_sha1(); |
51 | EVP_MD_CTX md; | 51 | EVP_MD_CTX md; |
52 | unsigned char *digest, *sig, *ret; | 52 | u_char *digest, *sig, *ret; |
53 | unsigned int slen, dlen, len; | 53 | u_int slen, dlen, len; |
54 | int ok; | 54 | int ok; |
55 | Buffer b; | 55 | Buffer b; |
56 | 56 | ||
@@ -109,15 +109,15 @@ ssh_rsa_sign( | |||
109 | int | 109 | int |
110 | ssh_rsa_verify( | 110 | ssh_rsa_verify( |
111 | Key *key, | 111 | Key *key, |
112 | unsigned char *signature, int signaturelen, | 112 | u_char *signature, int signaturelen, |
113 | unsigned char *data, int datalen) | 113 | u_char *data, int datalen) |
114 | { | 114 | { |
115 | Buffer b; | 115 | Buffer b; |
116 | EVP_MD *evp_md = EVP_sha1(); | 116 | EVP_MD *evp_md = EVP_sha1(); |
117 | EVP_MD_CTX md; | 117 | EVP_MD_CTX md; |
118 | char *ktype; | 118 | char *ktype; |
119 | unsigned char *sigblob, *digest; | 119 | u_char *sigblob, *digest; |
120 | unsigned int len, dlen; | 120 | u_int len, dlen; |
121 | int rlen; | 121 | int rlen; |
122 | int ret; | 122 | int ret; |
123 | 123 | ||
@@ -135,7 +135,7 @@ ssh_rsa_verify( | |||
135 | return -1; | 135 | return -1; |
136 | } | 136 | } |
137 | xfree(ktype); | 137 | xfree(ktype); |
138 | sigblob = (unsigned char *)buffer_get_string(&b, &len); | 138 | sigblob = (u_char *)buffer_get_string(&b, &len); |
139 | rlen = buffer_len(&b); | 139 | rlen = buffer_len(&b); |
140 | buffer_free(&b); | 140 | buffer_free(&b); |
141 | if(rlen != 0) { | 141 | if(rlen != 0) { |