| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/nss_util.h" | 5 #include "base/nss_util.h" |
| 6 #include "base/nss_util_internal.h" | 6 #include "base/nss_util_internal.h" |
| 7 | 7 |
| 8 #include <nss.h> | 8 #include <nss.h> |
| 9 #include <plarena.h> | 9 #include <plarena.h> |
| 10 #include <prerror.h> | 10 #include <prerror.h> |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 } | 223 } |
| 224 CloseTestNSSDB(); | 224 CloseTestNSSDB(); |
| 225 if (root_) { | 225 if (root_) { |
| 226 SECMOD_UnloadUserModule(root_); | 226 SECMOD_UnloadUserModule(root_); |
| 227 SECMOD_DestroyModule(root_); | 227 SECMOD_DestroyModule(root_); |
| 228 root_ = NULL; | 228 root_ = NULL; |
| 229 } | 229 } |
| 230 | 230 |
| 231 SECStatus status = NSS_Shutdown(); | 231 SECStatus status = NSS_Shutdown(); |
| 232 if (status != SECSuccess) { | 232 if (status != SECSuccess) { |
| 233 // We LOG(INFO) because this failure is relatively harmless | 233 // We VLOG(1) because this failure is relatively harmless (leaking, but |
| 234 // (leaking, but we're shutting down anyway). | 234 // we're shutting down anyway). |
| 235 LOG(INFO) << "NSS_Shutdown failed; see " | 235 VLOG(1) << "NSS_Shutdown failed; see " |
| 236 "http://code.google.com/p/chromium/issues/detail?id=4609"; | 236 "http://code.google.com/p/chromium/issues/detail?id=4609"; |
| 237 } | 237 } |
| 238 } | 238 } |
| 239 | 239 |
| 240 #if defined(OS_CHROMEOS) | 240 #if defined(OS_CHROMEOS) |
| 241 void OpenPersistentNSSDB() { | 241 void OpenPersistentNSSDB() { |
| 242 if (!chromeos_user_logged_in_) { | 242 if (!chromeos_user_logged_in_) { |
| 243 chromeos_user_logged_in_ = true; | 243 chromeos_user_logged_in_ = true; |
| 244 real_db_slot_ = OpenUserDB(GetDefaultConfigDirectory(), | 244 real_db_slot_ = OpenUserDB(GetDefaultConfigDirectory(), |
| 245 "Real NSS database"); | 245 "Real NSS database"); |
| 246 } | 246 } |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 exploded.millisecond = prxtime.tm_usec / 1000; | 363 exploded.millisecond = prxtime.tm_usec / 1000; |
| 364 | 364 |
| 365 return Time::FromUTCExploded(exploded); | 365 return Time::FromUTCExploded(exploded); |
| 366 } | 366 } |
| 367 | 367 |
| 368 PK11SlotInfo* GetDefaultNSSKeySlot() { | 368 PK11SlotInfo* GetDefaultNSSKeySlot() { |
| 369 return Singleton<NSSInitSingleton>::get()->GetDefaultKeySlot(); | 369 return Singleton<NSSInitSingleton>::get()->GetDefaultKeySlot(); |
| 370 } | 370 } |
| 371 | 371 |
| 372 } // namespace base | 372 } // namespace base |
| OLD | NEW |