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

Pass the ssh_signkey structure itself to public key methods.

Browse Source 
Not all of them, but the ones that don't get a 'void *key' parameter.
This means I can share methods between multiple ssh_signkey
structures, and still give those methods an easy way to find out which
public key method they're dealing with, by loading parameters from a
larger structure in which the ssh_signkey is the first element.

(In OO terms, I'm arranging that all static methods of my public key
classes get a pointer to the class vtable, to make up for not having a
pointer to the class instance.)

I haven't actually done anything with the new facility in this commit,
but it will shortly allow me to clean up the constant lookups by curve
name in the ECDSA code.
This commit is contained in:
Simon Tatham
2015-05-15 10:12:07 +01:00
parent a5fc95b715
commit 870ad6ab07
9 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sshdss.c
View File

@ -85,7 +85,8 @@ static Bignum get160(const char **data, int *datalen)
static void dss_freekey(void *key); /* forward reference */
static void *dss_newkey(const char *data, int len)
static void *dss_newkey(const struct ssh_signkey *self,
const char *data, int len)
{
const char *p;
int slen;
@ -366,7 +367,8 @@ static unsigned char *dss_private_blob(void *key, int *len)
return blob;
}
static void *dss_createkey(const unsigned char *pub_blob, int pub_len,
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)
{
struct dss_key *dss;
@ -377,7 +379,7 @@ static void *dss_createkey(const unsigned char *pub_blob, int pub_len,
unsigned char digest[20];
Bignum ytest;
dss = dss_newkey((char *) pub_blob, pub_len);
dss = dss_newkey(self, (char *) pub_blob, pub_len);
if (!dss)
return NULL;
dss->x = getmp(&pb, &priv_len);
@ -417,7 +419,8 @@ static void *dss_createkey(const unsigned char *pub_blob, int pub_len,
return dss;
}
static void *dss_openssh_createkey(const unsigned char **blob, int *len)
static void *dss_openssh_createkey(const struct ssh_signkey *self,
const unsigned char **blob, int *len)
{
const char **b = (const char **) blob;
struct dss_key *dss;
@ -468,12 +471,13 @@ static int dss_openssh_fmtkey(void *key, unsigned char *blob, int len)
return bloblen;
}
static int dss_pubkey_bits(const void *blob, int len)
static int dss_pubkey_bits(const struct ssh_signkey *self,
const void *blob, int len)
{
struct dss_key *dss;
int ret;
dss = dss_newkey((const char *) blob, len);
dss = dss_newkey(self, (const char *) blob, len);
if (!dss)
return -1;
ret = bignum_bitcount(dss->p);