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

Unified Diff: net/third_party/mozilla_security_manager/nsKeygenHandler.cpp

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
Index: net/third_party/mozilla_security_manager/nsKeygenHandler.cpp
===================================================================
--- net/third_party/mozilla_security_manager/nsKeygenHandler.cpp (revision 81350)
+++ net/third_party/mozilla_security_manager/nsKeygenHandler.cpp (working copy)
@@ -49,7 +49,7 @@
#include "base/base64.h"
#include "base/logging.h"
-#include "base/nss_util.h"
+#include "crypto/nss_util.h"
#include "googleurl/src/gurl.h"
namespace {
@@ -136,7 +136,7 @@
VLOG(1) << "Creating key pair...";
{
- base::AutoNSSWriteLock lock;
+ crypto::AutoNSSWriteLock lock;
privateKey = PK11_GenerateKeyPair(slot,
keyGenMechanism,
keyGenParams,
@@ -159,7 +159,7 @@
// example.com", but localize it.
const std::string& label = url.host();
{
- base::AutoNSSWriteLock lock;
+ crypto::AutoNSSWriteLock lock;
PK11_SetPublicKeyNickname(publicKey, label.c_str());
PK11_SetPrivateKeyNickname(privateKey, label.c_str());
}
@@ -235,7 +235,7 @@
// On successful keygen we need to keep the private key, of course,
// or we won't be able to use the client certificate.
if (!isSuccess || !stores_key) {
- base::AutoNSSWriteLock lock;
+ crypto::AutoNSSWriteLock lock;
PK11_DestroyTokenObject(privateKey->pkcs11Slot, privateKey->pkcs11ID);
}
SECKEY_DestroyPrivateKey(privateKey);
@@ -243,7 +243,7 @@
if (publicKey) {
if (!isSuccess || !stores_key) {
- base::AutoNSSWriteLock lock;
+ crypto::AutoNSSWriteLock lock;
PK11_DestroyTokenObject(publicKey->pkcs11Slot, publicKey->pkcs11ID);
}
SECKEY_DestroyPublicKey(publicKey);
« no previous file with comments | « net/socket/ssl_server_socket_unittest.cc ('k') | net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698