components/webcrypto/openssl/pbkdf2_openssl.cc - Issue 1077273002: html_viewer: Move webcrypto to a place where html_viewer can use it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« components/webcrypto/algorithm_implementation.h ('K') | « components/webcrypto/openssl/key_openssl.cc ('k') | components/webcrypto/openssl/rsa_hashed_algorithm_openssl.h » ('j') | content/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/webcrypto/openssl/pbkdf2_openssl.cc

diff --git a/content/child/webcrypto/openssl/pbkdf2_openssl.cc b/components/webcrypto/openssl/pbkdf2_openssl.cc

similarity index 91%

rename from content/child/webcrypto/openssl/pbkdf2_openssl.cc

rename to components/webcrypto/openssl/pbkdf2_openssl.cc

index 5c7bf1a4c98b19a0a26644c3ae9cbdae3e1abeeb..987a7e5da9c7109c20b1b7776ed5ff6e584973c5 100644

--- a/content/child/webcrypto/openssl/pbkdf2_openssl.cc

+++ b/components/webcrypto/openssl/pbkdf2_openssl.cc

@@ -3,17 +3,17 @@

// found in the LICENSE file.

#include "base/stl_util.h"

-#include "content/child/webcrypto/algorithm_implementation.h"

-#include "content/child/webcrypto/crypto_data.h"

-#include "content/child/webcrypto/openssl/key_openssl.h"

-#include "content/child/webcrypto/openssl/util_openssl.h"

-#include "content/child/webcrypto/status.h"

-#include "content/child/webcrypto/webcrypto_util.h"

+#include "components/webcrypto/algorithm_implementation.h"

+#include "components/webcrypto/crypto_data.h"

+#include "components/webcrypto/openssl/key_openssl.h"

+#include "components/webcrypto/openssl/util_openssl.h"

+#include "components/webcrypto/status.h"

+#include "components/webcrypto/webcrypto_util.h"

#include "crypto/openssl_util.h"

#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"

#include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"

-namespace content {

+namespace components {

namespace webcrypto {

@@ -119,4 +119,4 @@ AlgorithmImplementation* CreatePlatformPbkdf2Implementation() {

} // namespace webcrypto

-} // namespace content

+} // namespace components