Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1662)

Unified Diff: net/base/keygen_handler_nss.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/keygen_handler_mac.cc ('k') | net/base/keygen_handler_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/keygen_handler_nss.cc
===================================================================
--- net/base/keygen_handler_nss.cc (revision 81350)
+++ net/base/keygen_handler_nss.cc (working copy)
@@ -4,11 +4,11 @@
#include "net/base/keygen_handler.h"
-#include "base/crypto/crypto_module_blocking_password_delegate.h"
-#include "base/crypto/scoped_nss_types.h"
#include "base/logging.h"
-#include "base/nss_util.h"
-#include "base/nss_util_internal.h"
+#include "crypto/crypto_module_blocking_password_delegate.h"
+#include "crypto/nss_util.h"
+#include "crypto/nss_util_internal.h"
+#include "crypto/scoped_nss_types.h"
#include "net/third_party/mozilla_security_manager/nsKeygenHandler.h"
// PSM = Mozilla's Personal Security Manager.
@@ -18,10 +18,10 @@
std::string KeygenHandler::GenKeyAndSignChallenge() {
// Ensure NSS is initialized.
- base::EnsureNSSInit();
+ crypto::EnsureNSSInit();
// TODO(mattm): allow choosing which slot to generate and store the key.
- base::ScopedPK11Slot slot(base::GetPrivateNSSKeySlot());
+ crypto::ScopedPK11Slot slot(crypto::GetPrivateNSSKeySlot());
if (!slot.get()) {
LOG(ERROR) << "Couldn't get private key slot from NSS!";
return std::string();
@@ -39,7 +39,7 @@
}
void KeygenHandler::set_crypto_module_password_delegate(
- base::CryptoModuleBlockingPasswordDelegate* delegate) {
+ crypto::CryptoModuleBlockingPasswordDelegate* delegate) {
crypto_module_password_delegate_.reset(delegate);
}
« no previous file with comments | « net/base/keygen_handler_mac.cc ('k') | net/base/keygen_handler_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698