From 20791b5d6a7ffe1030b6561f1e07d338cac9b134 Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Tue, 21 Jan 2020 18:52:09 +0000 Subject: [PATCH] Bug 1610179 - Remove and recreate the database doesn't actually do anything in RKV safe-mode, r=keeler Differential Revision: https://phabricator.services.mozilla.com/D60377 --HG-- extra : moz-landing-system : lando --- security/manager/ssl/cert_storage/src/lib.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/security/manager/ssl/cert_storage/src/lib.rs b/security/manager/ssl/cert_storage/src/lib.rs index 0224e34bd0b5..717dc6d21841 100644 --- a/security/manager/ssl/cert_storage/src/lib.rs +++ b/security/manager/ssl/cert_storage/src/lib.rs @@ -896,10 +896,16 @@ fn unconditionally_remove_file(path: &Path) -> Result<(), SecurityStateError> { } fn remove_db(path: &Path) -> Result<(), SecurityStateError> { + // Remove LMDB-related files. let db = path.join("data.mdb"); unconditionally_remove_file(&db)?; let lock = path.join("lock.mdb"); unconditionally_remove_file(&lock)?; + + // Remove SafeMode-related files. + let db = path.join("data.safe.bin"); + unconditionally_remove_file(&db)?; + Ok(()) }