nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-21 04:55:02 -05:00
Code Issues Projects Releases Wiki Activity

Convert implicit (char *) and (unsigned char *) casts to explicit ones.

Browse Source 
[originally from svn r2840]
This commit is contained in:
Ben Harris 2003-02-12 23:06:40 +00:00
parent 69b51f5234
commit a0e773df86
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
import.c
View File

@ -505,20 +505,20 @@ struct ssh2_userkey *openssh_read(const Filename *filename, char *passphrase)
unsigned char keybuf[32]; unsigned char keybuf[32];
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Update(&md5c, key->iv, 8); MD5Update(&md5c, (unsigned char *)key->iv, 8);
MD5Final(keybuf, &md5c); MD5Final(keybuf, &md5c);
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, keybuf, 16); MD5Update(&md5c, keybuf, 16);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Update(&md5c, key->iv, 8); MD5Update(&md5c, (unsigned char *)key->iv, 8);
MD5Final(keybuf+16, &md5c); MD5Final(keybuf+16, &md5c);
/* /*
* Now decrypt the key blob. * Now decrypt the key blob.
*/ */
des3_decrypt_pubkey_ossh(keybuf, key->iv, des3_decrypt_pubkey_ossh(keybuf, (unsigned char *)key->iv,
key->keyblob, key->keyblob_len); key->keyblob, key->keyblob_len);
memset(&md5c, 0, sizeof(md5c)); memset(&md5c, 0, sizeof(md5c));
@ -600,7 +600,7 @@ struct ssh2_userkey *openssh_read(const Filename *filename, char *passphrase)
*/ */
if (i == 1) { if (i == 1) {
/* Save the details for after we deal with number 2. */ /* Save the details for after we deal with number 2. */
modptr = p; modptr = (char *)p;
modlen = len; modlen = len;
} else if (i != 6 && i != 7) { } else if (i != 6 && i != 7) {
PUT_32BIT(blob+blobptr, len); PUT_32BIT(blob+blobptr, len);
@ -845,13 +845,13 @@ int openssh_write(const Filename *filename, struct ssh2_userkey *key,
for (i = 0; i < 8; i++) iv[i] = random_byte(); for (i = 0; i < 8; i++) iv[i] = random_byte();
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Update(&md5c, iv, 8); MD5Update(&md5c, iv, 8);
MD5Final(keybuf, &md5c); MD5Final(keybuf, &md5c);
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, keybuf, 16); MD5Update(&md5c, keybuf, 16);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Update(&md5c, iv, 8); MD5Update(&md5c, iv, 8);
MD5Final(keybuf+16, &md5c); MD5Final(keybuf+16, &md5c);
@ -1259,7 +1259,7 @@ struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase)
errmsg = "Key blob does not contain actual key data"; errmsg = "Key blob does not contain actual key data";
goto error; goto error;
} }
ciphertext = key->keyblob + pos + 4; ciphertext = (char *)key->keyblob + pos + 4;
cipherlen = len; cipherlen = len;
if (cipherlen == 0) { if (cipherlen == 0) {
errmsg = "Length of key data is zero"; errmsg = "Length of key data is zero";
@ -1288,11 +1288,11 @@ struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase)
} }
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c); MD5Final(keybuf, &md5c);
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Update(&md5c, keybuf, 16); MD5Update(&md5c, keybuf, 16);
MD5Final(keybuf+16, &md5c); MD5Final(keybuf+16, &md5c);
@ -1300,7 +1300,8 @@ struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase)
* Now decrypt the key blob. * Now decrypt the key blob.
*/ */
memset(iv, 0, sizeof(iv)); memset(iv, 0, sizeof(iv));
des3_decrypt_pubkey_ossh(keybuf, iv, ciphertext, cipherlen); des3_decrypt_pubkey_ossh(keybuf, iv, (unsigned char *)ciphertext,
cipherlen);
memset(&md5c, 0, sizeof(md5c)); memset(&md5c, 0, sizeof(md5c));
memset(keybuf, 0, sizeof(keybuf)); memset(keybuf, 0, sizeof(keybuf));
@ -1532,7 +1533,7 @@ int sshcom_write(const Filename *filename, struct ssh2_userkey *key,
while (padding--) while (padding--)
outblob[pos++] = random_byte(); outblob[pos++] = random_byte();
} }
ciphertext = outblob+lenpos+4; ciphertext = (char *)outblob+lenpos+4;
cipherlen = pos - (lenpos+4); cipherlen = pos - (lenpos+4);
assert(!passphrase || cipherlen % 8 == 0); assert(!passphrase || cipherlen % 8 == 0);
/* Wrap up the encrypted blob string. */ /* Wrap up the encrypted blob string. */
@ -1558,11 +1559,11 @@ int sshcom_write(const Filename *filename, struct ssh2_userkey *key,
unsigned char keybuf[32], iv[8]; unsigned char keybuf[32], iv[8];
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c); MD5Final(keybuf, &md5c);
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Update(&md5c, keybuf, 16); MD5Update(&md5c, keybuf, 16);
MD5Final(keybuf+16, &md5c); MD5Final(keybuf+16, &md5c);
@ -1570,7 +1571,8 @@ int sshcom_write(const Filename *filename, struct ssh2_userkey *key,
* Now decrypt the key blob. * Now decrypt the key blob.
*/ */
memset(iv, 0, sizeof(iv)); memset(iv, 0, sizeof(iv));
des3_encrypt_pubkey_ossh(keybuf, iv, ciphertext, cipherlen); des3_encrypt_pubkey_ossh(keybuf, iv, (unsigned char *)ciphertext,
cipherlen);
memset(&md5c, 0, sizeof(md5c)); memset(&md5c, 0, sizeof(md5c));
memset(keybuf, 0, sizeof(keybuf)); memset(keybuf, 0, sizeof(keybuf));