diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-05-09 20:23:03 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-05-09 20:23:03 -0400 |
| commit | c39af97542ef38620204d25d86939afe0758c05b (patch) | |
| tree | 2905e03574fa479e4251822437b8a6afbf6fdbf9 /tools | |
| parent | 92a3547b90985e069e390f062efbef89da44b759 (diff) | |
| parent | bec4be4c48239613ed1c704ae71bf08754eef711 (diff) | |
| download | vcxsrv-c39af97542ef38620204d25d86939afe0758c05b.tar.gz vcxsrv-c39af97542ef38620204d25d86939afe0758c05b.tar.bz2 vcxsrv-c39af97542ef38620204d25d86939afe0758c05b.zip | |
Merge branch 'release/external-1.17.0.0-x' into release/1.17.0.0-x
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/plink/sshpubk.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/plink/sshpubk.c b/tools/plink/sshpubk.c index cf9e44b36..2f8a2be30 100644 --- a/tools/plink/sshpubk.c +++ b/tools/plink/sshpubk.c @@ -796,6 +796,7 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename, goto error; } sfree(public_blob); + smemclr(private_blob, private_blob_len); sfree(private_blob); sfree(encryption); if (errorstr) @@ -816,8 +817,10 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename, sfree(mac); if (public_blob) sfree(public_blob); - if (private_blob) - sfree(private_blob); + if (private_blob) { + smemclr(private_blob, private_blob_len); + sfree(private_blob); + } if (errorstr) *errorstr = error; return ret; @@ -1106,8 +1109,14 @@ int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key, } fp = f_open(filename, "w", TRUE); - if (!fp) - return 0; + if (!fp) { + sfree(pub_blob); + smemclr(priv_blob, priv_blob_len); + sfree(priv_blob); + smemclr(priv_blob_encrypted, priv_blob_len); + sfree(priv_blob_encrypted); + return 0; + } fprintf(fp, "PuTTY-User-Key-File-2: %s\n", key->alg->name); fprintf(fp, "Encryption: %s\n", cipherstr); fprintf(fp, "Comment: %s\n", key->comment); @@ -1124,6 +1133,7 @@ int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key, sfree(pub_blob); smemclr(priv_blob, priv_blob_len); sfree(priv_blob); + smemclr(priv_blob_encrypted, priv_blob_len); sfree(priv_blob_encrypted); return 1; } |