# HG changeset patch # User Thorsten Horstmann # Date 1424789294 -28800 # Node ID 31727a8abd4bace8fddf7afebf1da64e98717f8d # Parent a5b785c1234077430617cd4346100aa95a1595de Use m_burn rather than memset diff -r a5b785c12340 -r 31727a8abd4b keyimport.c --- a/keyimport.c Tue Feb 24 22:41:26 2015 +0800 +++ b/keyimport.c Tue Feb 24 22:48:14 2015 +0800 @@ -464,17 +464,16 @@ 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 @@ 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; }