1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 11:32:48 -05:00

Patch from Colin Watson intended to give a clean Unix compile with GCC 4.

(Since we choose to compile with -Werror, this is particularly important.)

I haven't yet checked that the resulting source actually compiles cleanly with
GCC 4, hence not marking `gcc4-warnings' as fixed just yet.

[originally from svn r7041]
This commit is contained in:
Jacob Nevins
2006-12-30 23:00:14 +00:00
parent dbb8e96493
commit cd94e3bc3c
9 changed files with 37 additions and 30 deletions

View File

@ -233,7 +233,7 @@ static int move(char *from, char *to)
return TRUE;
}
static char *blobfp(char *alg, int bits, char *blob, int bloblen)
static char *blobfp(char *alg, int bits, unsigned char *blob, int bloblen)
{
char buffer[128];
unsigned char digest[16];
@ -270,7 +270,8 @@ int main(int argc, char **argv)
int sshver = 0;
struct ssh2_userkey *ssh2key = NULL;
struct RSAKey *ssh1key = NULL;
char *ssh2blob = NULL, *ssh2alg = NULL;
unsigned char *ssh2blob = NULL;
char *ssh2alg = NULL;
const struct ssh_signkey *ssh2algf = NULL;
int ssh2bloblen;
char *passphrase = NULL;
@ -715,12 +716,12 @@ int main(int argc, char **argv)
ssh1key = snew(struct RSAKey);
if (!load_encrypted) {
void *vblob;
char *blob;
unsigned char *blob;
int n, l, bloblen;
ret = rsakey_pubblob(&infilename, &vblob, &bloblen,
&origcomment, &error);
blob = (char *)vblob;
blob = (unsigned char *)vblob;
n = 4; /* skip modulus bits */