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

Unified Diff: crypto/hmac_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: 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: crypto/hmac_nss.cc
===================================================================
--- crypto/hmac_nss.cc (revision 79901)
+++ crypto/hmac_nss.cc (working copy)
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/hmac.h"
+#include "crypto/hmac.h"
#include <nss.h>
#include <pk11pub.h>
-#include "base/crypto/scoped_nss_types.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/nss_util.h"
+#include "crypto/nss_util.h"
+#include "crypto/scoped_nss_types.h"
-namespace base {
+namespace crypto {
struct HMACPlatformData {
CK_MECHANISM_TYPE mechanism_;
@@ -40,7 +40,7 @@
}
bool HMAC::Init(const unsigned char *key, int key_length) {
- base::EnsureNSSInit();
+ EnsureNSSInit();
if (plat_->slot_.get()) {
// Init must not be called more than twice on the same HMAC object.
@@ -114,4 +114,4 @@
return true;
}
-} // namespace base
+} // namespace crypto

Powered by Google App Engine
This is Rietveld 408576698