projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support for non-ISO-8859-1 X keysyms. So in particular, pterm in a
[u/mdw/putty]
/
pageant.c
diff --git
a/pageant.c
b/pageant.c
index
50daf63
..
c401ea5
100644
(file)
--- a/
pageant.c
+++ b/
pageant.c
@@
-437,7
+437,7
@@
static void add_keyfile(Filename filename)
return;
}
/* For our purposes we want the blob prefixed with its length */
return;
}
/* For our purposes we want the blob prefixed with its length */
- blob2 = s
malloc(bloblen+4
);
+ blob2 = s
newn(bloblen+4, unsigned char
);
PUT_32BIT(blob2, bloblen);
memcpy(blob2 + 4, blob, bloblen);
sfree(blob);
PUT_32BIT(blob2, bloblen);
memcpy(blob2 + 4, blob, bloblen);
sfree(blob);
@@
-477,7
+477,7
@@
static void add_keyfile(Filename filename)
needs_pass = ssh2_userkey_encrypted(&filename, &comment);
attempts = 0;
if (type == SSH_KEYTYPE_SSH1)
needs_pass = ssh2_userkey_encrypted(&filename, &comment);
attempts = 0;
if (type == SSH_KEYTYPE_SSH1)
- rkey = s
malloc(sizeof(*rkey)
);
+ rkey = s
new(struct RSAKey
);
pps.passphrase = passphrase;
pps.comment = comment;
original_pass = 0;
pps.passphrase = passphrase;
pps.comment = comment;
original_pass = 0;
@@
-550,7
+550,7
@@
static void add_keyfile(Filename filename)
ssh1_bignum_length(rkey->q) + 4 + clen /* comment */
;
ssh1_bignum_length(rkey->q) + 4 + clen /* comment */
;
- request = s
malloc(reqlen
);
+ request = s
newn(reqlen, unsigned char
);
request[4] = SSH1_AGENTC_ADD_RSA_IDENTITY;
reqlen = 5;
request[4] = SSH1_AGENTC_ADD_RSA_IDENTITY;
reqlen = 5;
@@
-598,7
+598,7
@@
static void add_keyfile(Filename filename)
4 + clen /* comment */
;
4 + clen /* comment */
;
- request = s
malloc(reqlen
);
+ request = s
newn(reqlen, unsigned char
);
request[4] = SSH2_AGENTC_ADD_IDENTITY;
reqlen = 5;
request[4] = SSH2_AGENTC_ADD_IDENTITY;
reqlen = 5;
@@
-657,7
+657,7
@@
static void *make_keylist1(int *length)
}
/* Allocate the buffer. */
}
/* Allocate the buffer. */
- p = ret = s
malloc(len
);
+ p = ret = s
newn(len, unsigned char
);
if (length) *length = len;
PUT_32BIT(p, nkeys);
if (length) *length = len;
PUT_32BIT(p, nkeys);
@@
-702,7
+702,7
@@
static void *make_keylist2(int *length)
}
/* Allocate the buffer. */
}
/* Allocate the buffer. */
- p = ret = s
malloc(len
);
+ p = ret = s
newn(len, unsigned char
);
if (length) *length = len;
/*
if (length) *length = len;
/*
@@
-748,7
+748,7
@@
static void *get_keylist1(void)
if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER)
return NULL;
if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER)
return NULL;
- ret = s
malloc(resplen-5
);
+ ret = s
newn(resplen-5, unsigned char
);
memcpy(ret, response+5, resplen-5);
sfree(response);
} else {
memcpy(ret, response+5, resplen-5);
sfree(response);
} else {
@@
-779,7
+779,7
@@
static void *get_keylist2(void)
if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER)
return NULL;
if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER)
return NULL;
- ret = s
malloc(resplen-5
);
+ ret = s
newn(resplen-5, unsigned char
);
memcpy(ret, response+5, resplen-5);
sfree(response);
} else {
memcpy(ret, response+5, resplen-5);
sfree(response);
} else {
@@
-931,7
+931,7
@@
static void answer_msg(void *msg)
struct RSAKey *key;
char *comment;
int commentlen;
struct RSAKey *key;
char *comment;
int commentlen;
- key = s
malloc(sizeof(struct RSAKey)
);
+ key = s
new(struct RSAKey
);
memset(key, 0, sizeof(struct RSAKey));
p += makekey(p, key, NULL, 1);
p += makeprivate(p, key);
memset(key, 0, sizeof(struct RSAKey));
p += makekey(p, key, NULL, 1);
p += makeprivate(p, key);
@@
-939,7
+939,7
@@
static void answer_msg(void *msg)
p += ssh1_read_bignum(p, &key->p); /* p */
p += ssh1_read_bignum(p, &key->q); /* q */
commentlen = GET_32BIT(p);
p += ssh1_read_bignum(p, &key->p); /* p */
p += ssh1_read_bignum(p, &key->q); /* q */
commentlen = GET_32BIT(p);
- comment = s
malloc(commentlen+1
);
+ comment = s
newn(commentlen+1, char
);
if (comment) {
memcpy(comment, p + 4, commentlen);
comment[commentlen] = '\0';
if (comment) {
memcpy(comment, p + 4, commentlen);
comment[commentlen] = '\0';
@@
-967,7
+967,7
@@
static void answer_msg(void *msg)
int alglen, commlen;
int bloblen;
int alglen, commlen;
int bloblen;
- key = s
malloc(sizeof(struct ssh2_userkey)
);
+ key = s
new(struct ssh2_userkey
);
alglen = GET_32BIT(p);
p += 4;
alglen = GET_32BIT(p);
p += 4;
@@
-995,7
+995,7
@@
static void answer_msg(void *msg)
commlen = GET_32BIT(p);
p += 4;
commlen = GET_32BIT(p);
p += 4;
- comment = s
malloc(commlen + 1
);
+ comment = s
newn(commlen + 1, char
);
if (comment) {
memcpy(comment, p, commlen);
comment[commlen] = '\0';
if (comment) {
memcpy(comment, p, commlen);
comment[commlen] = '\0';
@@
-1240,7
+1240,7
@@
static void prompt_add_keyfile(void)
{
OPENFILENAME of;
char filename[FILENAME_MAX];
{
OPENFILENAME of;
char filename[FILENAME_MAX];
- char *filelist = s
malloc(8192
);
+ char *filelist = s
newn(8192, char
);
char *filewalker;
int n, dirlen;
char *filewalker;
int n, dirlen;
@@
-1387,7
+1387,7
@@
static int CALLBACK KeyListProc(HWND hwnd, UINT msg,
}
/* get item indices in an array */
}
/* get item indices in an array */
- selectedArray = s
malloc(numSelected * sizeof(int)
);
+ selectedArray = s
newn(numSelected, int
);
SendDlgItemMessage(hwnd, 100, LB_GETSELITEMS,
numSelected, (WPARAM)selectedArray);
SendDlgItemMessage(hwnd, 100, LB_GETSELITEMS,
numSelected, (WPARAM)selectedArray);