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

Side by Side Diff: components/webcrypto/openssl/pbkdf2_openssl.cc

Issue 1077273002: html_viewer: Move webcrypto to a place where html_viewer can use it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Copy the msvs_disabled_warnings to the new target. Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/stl_util.h" 5 #include "base/stl_util.h"
6 #include "content/child/webcrypto/algorithm_implementation.h" 6 #include "components/webcrypto/algorithm_implementation.h"
7 #include "content/child/webcrypto/crypto_data.h" 7 #include "components/webcrypto/crypto_data.h"
8 #include "content/child/webcrypto/openssl/key_openssl.h" 8 #include "components/webcrypto/openssl/key_openssl.h"
9 #include "content/child/webcrypto/openssl/util_openssl.h" 9 #include "components/webcrypto/openssl/util_openssl.h"
10 #include "content/child/webcrypto/status.h" 10 #include "components/webcrypto/status.h"
11 #include "content/child/webcrypto/webcrypto_util.h" 11 #include "components/webcrypto/webcrypto_util.h"
12 #include "crypto/openssl_util.h" 12 #include "crypto/openssl_util.h"
13 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" 13 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
14 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" 14 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
15 15
16 namespace content { 16 namespace components {
17 17
18 namespace webcrypto { 18 namespace webcrypto {
19 19
20 namespace { 20 namespace {
21 21
22 const blink::WebCryptoKeyUsageMask kAllKeyUsages = 22 const blink::WebCryptoKeyUsageMask kAllKeyUsages =
23 blink::WebCryptoKeyUsageDeriveKey | blink::WebCryptoKeyUsageDeriveBits; 23 blink::WebCryptoKeyUsageDeriveKey | blink::WebCryptoKeyUsageDeriveBits;
24 24
25 class Pbkdf2Implementation : public AlgorithmImplementation { 25 class Pbkdf2Implementation : public AlgorithmImplementation {
26 public: 26 public:
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 }; 112 };
113 113
114 } // namespace 114 } // namespace
115 115
116 AlgorithmImplementation* CreatePlatformPbkdf2Implementation() { 116 AlgorithmImplementation* CreatePlatformPbkdf2Implementation() {
117 return new Pbkdf2Implementation; 117 return new Pbkdf2Implementation;
118 } 118 }
119 119
120 } // namespace webcrypto 120 } // namespace webcrypto
121 121
122 } // namespace content 122 } // namespace components
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698