From 27330e8c7a129a060951061e10bfda0d836c44fa Mon Sep 17 00:00:00 2001 From: Thorsten Horstmann Date: Tue, 24 Feb 2015 22:48:14 +0800 Subject: Use m_burn rather than memset --- keyimport.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'keyimport.c') diff --git a/keyimport.c b/keyimport.c index 54eb5c3..8a0d525 100644 --- a/keyimport.c +++ b/keyimport.c @@ -464,17 +464,16 @@ static struct openssh_key *load_openssh_key(const char *filename) goto error; } - memset(buffer, 0, sizeof(buffer)); + m_burn(buffer, sizeof(buffer)); return ret; error: - memset(buffer, 0, sizeof(buffer)); + m_burn(buffer, sizeof(buffer)); if (ret) { if (ret->keyblob) { - memset(ret->keyblob, 0, ret->keyblob_size); + m_burn(ret->keyblob, ret->keyblob_size); m_free(ret->keyblob); } - memset(&ret, 0, sizeof(ret)); m_free(ret); } if (fp) { @@ -494,9 +493,8 @@ static int openssh_encrypted(const char *filename) if (!key) return 0; ret = key->encrypted; - memset(key->keyblob, 0, key->keyblob_size); + m_burn(key->keyblob, key->keyblob_size); m_free(key->keyblob); - memset(&key, 0, sizeof(key)); m_free(key); return ret; } -- cgit v1.2.1