projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use preprocessor trickery to make the signal translation mechanism a little
[u/mdw/putty]
/
import.c
diff --git
a/import.c
b/import.c
index
7deb02f
..
a3c2405
100644
(file)
--- a/
import.c
+++ b/
import.c
@@
-333,7
+333,7
@@
static struct openssh_key *load_openssh_key(const Filename *filename,
ret->encrypted = 0;
memset(ret->iv, 0, sizeof(ret->iv));
ret->encrypted = 0;
memset(ret->iv, 0, sizeof(ret->iv));
- fp = f_open(*filename, "r");
+ fp = f_open(*filename, "r"
, FALSE
);
if (!fp) {
errmsg = "unable to open key file";
goto error;
if (!fp) {
errmsg = "unable to open key file";
goto error;
@@
-893,7
+893,7
@@
int openssh_write(const Filename *filename, struct ssh2_userkey *key,
* And save it. We'll use Unix line endings just in case it's
* subsequently transferred in binary mode.
*/
* And save it. We'll use Unix line endings just in case it's
* subsequently transferred in binary mode.
*/
- fp = f_open(*filename, "wb"); /* ensure Unix line endings */
+ fp = f_open(*filename, "wb"
, TRUE
); /* ensure Unix line endings */
if (!fp)
goto error;
fputs(header, fp);
if (!fp)
goto error;
fputs(header, fp);
@@
-1027,7
+1027,7
@@
static struct sshcom_key *load_sshcom_key(const Filename *filename,
ret->keyblob = NULL;
ret->keyblob_len = ret->keyblob_size = 0;
ret->keyblob = NULL;
ret->keyblob_len = ret->keyblob_size = 0;
- fp = f_open(*filename, "r");
+ fp = f_open(*filename, "r"
, FALSE
);
if (!fp) {
errmsg = "unable to open key file";
goto error;
if (!fp) {
errmsg = "unable to open key file";
goto error;
@@
-1646,7
+1646,7
@@
int sshcom_write(const Filename *filename, struct ssh2_userkey *key,
* And save it. We'll use Unix line endings just in case it's
* subsequently transferred in binary mode.
*/
* And save it. We'll use Unix line endings just in case it's
* subsequently transferred in binary mode.
*/
- fp = f_open(*filename, "wb"); /* ensure Unix line endings */
+ fp = f_open(*filename, "wb"
, TRUE
); /* ensure Unix line endings */
if (!fp)
goto error;
fputs("---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----\n", fp);
if (!fp)
goto error;
fputs("---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----\n", fp);