mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 09:58:01 +00:00
Owen tells me the Mac compiler complains at a char / unsigned char
mismatch in the invocation of hmacmd5_key(). Do it properly with a void * argument. [originally from svn r5117]
This commit is contained in:
parent
76c2183709
commit
5e2305bdc9
2
ssh.h
2
ssh.h
@ -105,7 +105,7 @@ void MD5Simple(void const *p, unsigned len, unsigned char output[16]);
|
|||||||
|
|
||||||
void *hmacmd5_make_context(void);
|
void *hmacmd5_make_context(void);
|
||||||
void hmacmd5_free_context(void *handle);
|
void hmacmd5_free_context(void *handle);
|
||||||
void hmacmd5_key(void *handle, unsigned char const *key, int len);
|
void hmacmd5_key(void *handle, void const *key, int len);
|
||||||
void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len,
|
void hmacmd5_do_hmac(void *handle, unsigned char const *blk, int len,
|
||||||
unsigned char *hmac);
|
unsigned char *hmac);
|
||||||
|
|
||||||
|
3
sshmd5.c
3
sshmd5.c
@ -230,10 +230,11 @@ void hmacmd5_free_context(void *handle)
|
|||||||
sfree(handle);
|
sfree(handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmacmd5_key(void *handle, unsigned char const *key, int len)
|
void hmacmd5_key(void *handle, void const *keyv, int len)
|
||||||
{
|
{
|
||||||
struct MD5Context *keys = (struct MD5Context *)handle;
|
struct MD5Context *keys = (struct MD5Context *)handle;
|
||||||
unsigned char foo[64];
|
unsigned char foo[64];
|
||||||
|
unsigned char const *key = (unsigned char const *)keyv;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
memset(foo, 0x36, 64);
|
memset(foo, 0x36, 64);
|
||||||
|
Loading…
Reference in New Issue
Block a user