aboutsummaryrefslogtreecommitdiff
path: root/tools/plink/sshpubk.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-24 16:46:55 +0100
committermarha <marha@users.sourceforge.net>2012-01-24 16:46:55 +0100
commit6039fd0faf73c9d6c5b2abf9d824734218ec5eee (patch)
tree88f66f9d7c4763f206de6043ef45c63b94472690 /tools/plink/sshpubk.c
parentb683b8f5675e280a6dd4ab82d6b9394182798b55 (diff)
downloadvcxsrv-6039fd0faf73c9d6c5b2abf9d824734218ec5eee.tar.gz
vcxsrv-6039fd0faf73c9d6c5b2abf9d824734218ec5eee.tar.bz2
vcxsrv-6039fd0faf73c9d6c5b2abf9d824734218ec5eee.zip
Update to putty 9388
Diffstat (limited to 'tools/plink/sshpubk.c')
-rw-r--r--tools/plink/sshpubk.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/plink/sshpubk.c b/tools/plink/sshpubk.c
index 7b5a69071..c1386108a 100644
--- a/tools/plink/sshpubk.c
+++ b/tools/plink/sshpubk.c
@@ -162,7 +162,7 @@ int loadrsakey(const Filename *filename, struct RSAKey *key, char *passphrase,
int ret = 0;
const char *error = NULL;
- fp = f_open(*filename, "rb", FALSE);
+ fp = f_open(filename, "rb", FALSE);
if (!fp) {
error = "can't open file";
goto end;
@@ -203,7 +203,7 @@ int rsakey_encrypted(const Filename *filename, char **comment)
FILE *fp;
char buf[64];
- fp = f_open(*filename, "rb", FALSE);
+ fp = f_open(filename, "rb", FALSE);
if (!fp)
return 0; /* doesn't even exist */
@@ -241,7 +241,7 @@ int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
*bloblen = 0;
ret = 0;
- fp = f_open(*filename, "rb", FALSE);
+ fp = f_open(filename, "rb", FALSE);
if (!fp) {
error = "can't open file";
goto end;
@@ -364,7 +364,7 @@ int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase)
/*
* Done. Write the result to the file.
*/
- fp = f_open(*filename, "wb", TRUE);
+ fp = f_open(filename, "wb", TRUE);
if (fp) {
int ret = (fwrite(buf, 1, p - buf, fp) == (size_t) (p - buf));
if (fclose(fp))
@@ -632,7 +632,7 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
encryption = comment = mac = NULL;
public_blob = private_blob = NULL;
- fp = f_open(*filename, "rb", FALSE);
+ fp = f_open(filename, "rb", FALSE);
if (!fp) {
error = "can't open file";
goto error;
@@ -881,7 +881,7 @@ unsigned char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
public_blob = NULL;
- fp = f_open(*filename, "rb", FALSE);
+ fp = f_open(filename, "rb", FALSE);
if (!fp) {
error = "can't open file";
goto error;
@@ -962,7 +962,7 @@ int ssh2_userkey_encrypted(const Filename *filename, char **commentptr)
if (commentptr)
*commentptr = NULL;
- fp = f_open(*filename, "rb", FALSE);
+ fp = f_open(filename, "rb", FALSE);
if (!fp)
return 0;
if (!read_header(fp, header)
@@ -1143,7 +1143,7 @@ int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
memset(&s, 0, sizeof(s));
}
- fp = f_open(*filename, "w", TRUE);
+ fp = f_open(filename, "w", TRUE);
if (!fp)
return 0;
fprintf(fp, "PuTTY-User-Key-File-2: %s\n", key->alg->name);
@@ -1179,7 +1179,7 @@ int key_type(const Filename *filename)
const char openssh_sig[] = "-----BEGIN ";
int i;
- fp = f_open(*filename, "r", FALSE);
+ fp = f_open(filename, "r", FALSE);
if (!fp)
return SSH_KEYTYPE_UNOPENABLE;
i = fread(buf, 1, sizeof(buf), fp);