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

Make lots of generic data parameters into 'void *'.

Browse Source 
This is a cleanup I started to notice a need for during the BinarySink
work. It removes a lot of faffing about casting things to char * or
unsigned char * so that some API will accept them, even though lots of
such APIs really take a plain 'block of raw binary data' argument and
don't care what C thinks the signedness of that data might be - they
may well reinterpret it back and forth internally.

So I've tried to arrange for all the function call APIs that ought to
have a void * (or const void *) to have one, and those that need to do
pointer arithmetic on the parameter internally can cast it back at the
top of the function. That saves endless ad-hoc casts at the call
sites.
This commit is contained in:
Simon Tatham
2018-05-26 08:31:34 +01:00
parent 2fc29577df
commit 7babe66a83
40 changed files with 283 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sshdss.c
View File

@ -37,7 +37,7 @@ static Bignum getmp(const char **data, int *datalen)
return NULL;
if (p[0] & 0x80)
return NULL; /* negative mp */
b = bignum_from_bytes((const unsigned char *)p, length);
b = bignum_from_bytes(p, length);
return b;
}
@ -48,7 +48,7 @@ static Bignum get160(const char **data, int *datalen)
if (*datalen < 20)
return NULL;
b = bignum_from_bytes((const unsigned char *)*data, 20);
b = bignum_from_bytes(*data, 20);
*data += 20;
*datalen -= 20;
@ -58,8 +58,9 @@ static Bignum get160(const char **data, int *datalen)
static void dss_freekey(void *key); /* forward reference */
static void *dss_newkey(const struct ssh_signkey *self,
const char *data, int len)
const void *vdata, int len)
{
const char *data = (const char *)vdata;
const char *p;
int slen;
struct dss_key *dss;
@ -163,10 +164,11 @@ static char *dss_fmtkey(void *key)
return p;
}
static int dss_verifysig(void *key, const char *sig, int siglen,
const char *data, int datalen)
static int dss_verifysig(void *key, const void *vsig, int siglen,
const void *data, int datalen)
{
struct dss_key *dss = (struct dss_key *) key;
const char *sig = (const char *)vsig;
const char *p;
int slen;
char hash[20];
@ -290,8 +292,8 @@ static void dss_private_blob(void *key, BinarySink *bs)
}
static void *dss_createkey(const struct ssh_signkey *self,
const unsigned char *pub_blob, int pub_len,
const unsigned char *priv_blob, int priv_len)
const void *pub_blob, int pub_len,
const void *priv_blob, int priv_len)
{
struct dss_key *dss;
const char *pb = (const char *) priv_blob;
@ -301,7 +303,7 @@ static void *dss_createkey(const struct ssh_signkey *self,
unsigned char digest[20];
Bignum ytest;
dss = dss_newkey(self, (char *) pub_blob, pub_len);
dss = dss_newkey(self, pub_blob, pub_len);
if (!dss)
return NULL;
dss->x = getmp(&pb, &priv_len);
@ -382,7 +384,7 @@ static int dss_pubkey_bits(const struct ssh_signkey *self,
struct dss_key *dss;
int ret;
dss = dss_newkey(self, (const char *) blob, len);
dss = dss_newkey(self, blob, len);
if (!dss)
return -1;
ret = bignum_bitcount(dss->p);
@ -511,7 +513,7 @@ Bignum *dss_gen_k(const char *id_string, Bignum modulus, Bignum private_key,
}
}
static void dss_sign(void *key, const char *data, int datalen,
static void dss_sign(void *key, const void *data, int datalen,
BinarySink *bs)
{
struct dss_key *dss = (struct dss_key *) key;