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

Fix more unsigned char * vs char * warnings, usually by making implicit

Browse Source 
casts explicit.

[originally from svn r2464]
This commit is contained in:
Ben Harris 2003-01-05 14:11:14 +00:00
parent 24d299bbe8
commit 2af5d85989
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sshpubk.c
View File

@ -105,7 +105,7 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
*/ */
if (ciphertype) { if (ciphertype) {
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c); MD5Final(keybuf, &md5c);
des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7); des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7);
memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */ memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */
@ -155,7 +155,7 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
int loadrsakey(char *filename, struct RSAKey *key, char *passphrase) int loadrsakey(char *filename, struct RSAKey *key, char *passphrase)
{ {
FILE *fp; FILE *fp;
unsigned char buf[64]; char buf[64];
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
if (!fp) if (!fp)
@ -183,7 +183,7 @@ int loadrsakey(char *filename, struct RSAKey *key, char *passphrase)
int rsakey_encrypted(char *filename, char **comment) int rsakey_encrypted(char *filename, char **comment)
{ {
FILE *fp; FILE *fp;
unsigned char buf[64]; char buf[64];
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
if (!fp) if (!fp)
@ -208,7 +208,7 @@ int rsakey_encrypted(char *filename, char **comment)
int rsakey_pubblob(char *filename, void **blob, int *bloblen) int rsakey_pubblob(char *filename, void **blob, int *bloblen)
{ {
FILE *fp; FILE *fp;
unsigned char buf[64]; char buf[64];
struct RSAKey key; struct RSAKey key;
int ret; int ret;
@ -321,7 +321,7 @@ int saversakey(char *filename, struct RSAKey *key, char *passphrase)
*/ */
if (passphrase) { if (passphrase) {
MD5Init(&md5c); MD5Init(&md5c);
MD5Update(&md5c, passphrase, strlen(passphrase)); MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c); MD5Final(keybuf, &md5c);
des3_encrypt_pubkey(keybuf, estart, p - estart); des3_encrypt_pubkey(keybuf, estart, p - estart);
memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */ memset(keybuf, 0, sizeof(keybuf)); /* burn the evidence */
@ -529,7 +529,7 @@ int base64_decode_atom(char *atom, unsigned char *out)
return len; return len;
} }
static char *read_blob(FILE * fp, int nlines, int *bloblen) static unsigned char *read_blob(FILE * fp, int nlines, int *bloblen)
{ {
unsigned char *blob; unsigned char *blob;
char *line; char *line;
@ -873,7 +873,7 @@ char *ssh2_userkey_loadpub(char *filename, char **algorithm,
*pub_blob_len = public_blob_len; *pub_blob_len = public_blob_len;
if (algorithm) if (algorithm)
*algorithm = alg->name; *algorithm = alg->name;
return public_blob; return (char *)public_blob;
/* /*
* Error processing. * Error processing.
@ -1056,7 +1056,7 @@ int ssh2_save_userkey(char *filename, struct ssh2_userkey *key,
} }
if (passphrase) { if (passphrase) {
char key[40]; unsigned char key[40];
SHA_State s; SHA_State s;
passlen = strlen(passphrase); passlen = strlen(passphrase);