projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a stray prototype for mac_set_attr_mask().
[u/mdw/putty]
/
import.c
diff --git
a/import.c
b/import.c
index
e792651
..
ff43816
100644
(file)
--- a/
import.c
+++ b/
import.c
@@
-485,6
+485,8
@@
struct ssh2_userkey *openssh_read(char *filename, char *passphrase)
char *modptr;
int modlen;
char *modptr;
int modlen;
+ blob = NULL;
+
if (!key)
return NULL;
if (!key)
return NULL;
@@
-1026,9
+1028,9
@@
struct sshcom_key *load_sshcom_key(char *filename)
* Header lines can end in a trailing backslash for
* continuation.
*/
* Header lines can end in a trailing backslash for
* continuation.
*/
- while ((len = strlen(p)) >
sizeof(buffer) - (p-buffer) -1
||
+ while ((len = strlen(p)) >
(int)(sizeof(buffer) - (p-buffer) -1)
||
p[len-1] != '\n' || p[len-2] == '\\') {
p[len-1] != '\n' || p[len-2] == '\\') {
- if (len > (
p-buffer) + sizeof(buffer)-2
) {
+ if (len > (
int)((p-buffer) + sizeof(buffer)-2)
) {
errmsg = "Header line too long to deal with";
goto error;
}
errmsg = "Header line too long to deal with";
goto error;
}
@@
-1588,7
+1590,7
@@
int sshcom_write(char *filename, struct ssh2_userkey *key, char *passphrase)
{
int slen = 60; /* starts at 60 due to "Comment: " */
char *c = key->comment;
{
int slen = 60; /* starts at 60 due to "Comment: " */
char *c = key->comment;
- while (strlen(c) > slen) {
+ while (
(int)
strlen(c) > slen) {
fprintf(fp, "%.*s\\\n", slen, c);
c += slen;
slen = 70; /* allow 70 chars on subsequent lines */
fprintf(fp, "%.*s\\\n", slen, c);
c += slen;
slen = 70; /* allow 70 chars on subsequent lines */