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

Side by Side Diff: content/child/webcrypto/webcrypto_impl.h

Issue 278513004: [webcrypto] Fix a race in BlinkPlatformImpl::crypto(), by using eager initilization of WebCryptoImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Do initialization as part of crypto() Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_IMPL_H_ 5 #ifndef CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_IMPL_H_
6 #define CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_IMPL_H_ 6 #define CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "third_party/WebKit/public/platform/WebCrypto.h" 10 #include "third_party/WebKit/public/platform/WebCrypto.h"
11 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h" 11 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
12 #include "third_party/WebKit/public/platform/WebVector.h" 12 #include "third_party/WebKit/public/platform/WebVector.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 // Wrapper around the Blink WebCrypto asynchronous interface, which forwards to 16 // Wrapper around the Blink WebCrypto asynchronous interface, which forwards to
17 // the synchronous platfrom (NSS or OpenSSL) implementation. 17 // the synchronous platform (NSS or OpenSSL) implementation.
18 // 18 //
19 // TODO(eroman): Post the synchronous work to a background thread. 19 // EnsureInit() must be called prior to using WebCryptoImpl().
20 class WebCryptoImpl : public blink::WebCrypto { 20 class WebCryptoImpl : public blink::WebCrypto {
21 public: 21 public:
22 WebCryptoImpl(); 22 WebCryptoImpl();
23
23 virtual ~WebCryptoImpl(); 24 virtual ~WebCryptoImpl();
24 25
26 void EnsureInit();
Ryan Sleevi 2014/05/13 05:47:20 why a member instead of a static? Given that it's
eroman 2014/05/13 18:27:15 Good idea, done.
27
25 virtual void encrypt(const blink::WebCryptoAlgorithm& algorithm, 28 virtual void encrypt(const blink::WebCryptoAlgorithm& algorithm,
26 const blink::WebCryptoKey& key, 29 const blink::WebCryptoKey& key,
27 const unsigned char* data, 30 const unsigned char* data,
28 unsigned int data_size, 31 unsigned int data_size,
29 blink::WebCryptoResult result); 32 blink::WebCryptoResult result);
30 virtual void decrypt(const blink::WebCryptoAlgorithm& algorithm, 33 virtual void decrypt(const blink::WebCryptoAlgorithm& algorithm,
31 const blink::WebCryptoKey& key, 34 const blink::WebCryptoKey& key,
32 const unsigned char* data, 35 const unsigned char* data,
33 unsigned int data_size, 36 unsigned int data_size,
34 blink::WebCryptoResult result); 37 blink::WebCryptoResult result);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 virtual bool serializeKeyForClone(const blink::WebCryptoKey& key, 102 virtual bool serializeKeyForClone(const blink::WebCryptoKey& key,
100 blink::WebVector<unsigned char>& key_data); 103 blink::WebVector<unsigned char>& key_data);
101 104
102 private: 105 private:
103 DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl); 106 DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl);
104 }; 107 };
105 108
106 } // namespace content 109 } // namespace content
107 110
108 #endif // CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_IMPL_H_ 111 #endif // CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698