Minor fixes to Manager.Close (#464)
This commit is contained in:
parent
3a7608a747
commit
426c2e9f64
1 changed files with 6 additions and 2 deletions
|
@ -361,10 +361,14 @@ func (m *Manager) zeroSensitivePublicData() {
|
||||||
// Close cleanly shuts down the manager. It makes a best try effort to remove
|
// Close cleanly shuts down the manager. It makes a best try effort to remove
|
||||||
// and zero all private key and sensitive public key material associated with
|
// and zero all private key and sensitive public key material associated with
|
||||||
// the address manager from memory.
|
// the address manager from memory.
|
||||||
func (m *Manager) Close() error {
|
func (m *Manager) Close() {
|
||||||
m.mtx.Lock()
|
m.mtx.Lock()
|
||||||
defer m.mtx.Unlock()
|
defer m.mtx.Unlock()
|
||||||
|
|
||||||
|
if m.closed {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Attempt to clear private key material from memory.
|
// Attempt to clear private key material from memory.
|
||||||
if !m.watchingOnly && !m.locked {
|
if !m.watchingOnly && !m.locked {
|
||||||
m.lock()
|
m.lock()
|
||||||
|
@ -374,7 +378,7 @@ func (m *Manager) Close() error {
|
||||||
m.zeroSensitivePublicData()
|
m.zeroSensitivePublicData()
|
||||||
|
|
||||||
m.closed = true
|
m.closed = true
|
||||||
return nil
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// keyToManaged returns a new managed address for the provided derived key and
|
// keyToManaged returns a new managed address for the provided derived key and
|
||||||
|
|
Loading…
Reference in a new issue