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

Unified Diff: content/content_renderer.gypi

Issue 19757011: WebCrypto: Implement digest() using NSS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split out crypto functionality from abstract result class from Blink. Created 7 years, 4 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 | « no previous file | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 9d843eee0c771bd8cc84ce21e9cff1552f281477..6d5117760fae4c197501595d43c334b8f4b548ba 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -502,6 +502,8 @@
'renderer/web_ui_extension_data.h',
'renderer/webcrypto_impl.cc',
'renderer/webcrypto_impl.h',
+ 'renderer/webcrypto_impl_nss.cc',
+ 'renderer/webcrypto_impl_openssl.cc',
'renderer/websharedworker_proxy.cc',
'renderer/websharedworker_proxy.h',
'renderer/websharedworkerrepository_impl.cc',
@@ -695,6 +697,30 @@
'renderer/pepper/ppb_open_gl_es_impl.cc',
],
}],
+ ['use_openssl==1', {
+ 'sources!': [
+ 'renderer/webcrypto_impl_nss.cc',
+ ],
+ 'dependencies': [
+ '../third_party/openssl/openssl.gyp:openssl',
+ ],
+ }, {
+ 'sources!': [
+ 'renderer/webcrypto_impl_openssl.cc',
+ ],
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:ssl',
+ ],
+ }, {
+ 'dependencies': [
+ '../third_party/nss/nss.gyp:nspr',
+ '../third_party/nss/nss.gyp:nss',
+ ],
+ }],
+ ],
+ }],
],
'target_conditions': [
['OS=="android"', {
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698