diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 14:29:42 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 14:29:42 +0000 |
commit | 2c84baa742b7610eff54d26c83eaf45e724ecdbd (patch) | |
tree | 0c6a2b39345300762620b41bc74523b9c5d7221f /content/renderer/webcrypto_impl.h | |
parent | ad599f5f904b77f30a043fc43587457fa2aea7ed (diff) | |
download | chromium_src-2c84baa742b7610eff54d26c83eaf45e724ecdbd.zip chromium_src-2c84baa742b7610eff54d26c83eaf45e724ecdbd.tar.gz chromium_src-2c84baa742b7610eff54d26c83eaf45e724ecdbd.tar.bz2 |
Revert 223506 "WebCrypto: Implement importKey() and sign() for H..."
Believe it caused a compile failure on Linux. See:
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64
> WebCrypto: Implement importKey() and sign() for HMAC in NSS
>
> BUG=245025
> R=eroman@chromium.org,ellyjones@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/23569007
TBR=bryaneyler@google.com
Review URL: https://codereview.chromium.org/24205003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/webcrypto_impl.h')
-rw-r--r-- | content/renderer/webcrypto_impl.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/content/renderer/webcrypto_impl.h b/content/renderer/webcrypto_impl.h index 362be61..cb4a766 100644 --- a/content/renderer/webcrypto_impl.h +++ b/content/renderer/webcrypto_impl.h @@ -8,7 +8,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" -#include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "third_party/WebKit/public/platform/WebCrypto.h" @@ -24,24 +23,9 @@ class CONTENT_EXPORT WebCryptoImpl const unsigned char* data, unsigned data_size, WebKit::WebCryptoResult result); - virtual void importKey( - WebKit::WebCryptoKeyFormat format, - const unsigned char* key_data, - unsigned key_data_size, - const WebKit::WebCryptoAlgorithm& algorithm, - bool extractable, - WebKit::WebCryptoKeyUsageMask usage_mask, - WebKit::WebCryptoResult result); - virtual void sign( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, - const unsigned char* data, - unsigned data_size, - WebKit::WebCryptoResult result); protected: FRIEND_TEST_ALL_PREFIXES(WebCryptoImplTest, DigestSampleSets); - FRIEND_TEST_ALL_PREFIXES(WebCryptoImplTest, HMACSampleSets); void Init(); @@ -50,20 +34,6 @@ class CONTENT_EXPORT WebCryptoImpl const unsigned char* data, unsigned data_size, WebKit::WebArrayBuffer* buffer); - bool ImportKeyInternal( - WebKit::WebCryptoKeyFormat format, - const unsigned char* key_data, - unsigned key_data_size, - const WebKit::WebCryptoAlgorithm& algorithm, - WebKit::WebCryptoKeyUsageMask usage_mask, - scoped_ptr<WebKit::WebCryptoKeyHandle>* handle, - WebKit::WebCryptoKeyType* type); - bool SignInternal( - const WebKit::WebCryptoAlgorithm& algorithm, - const WebKit::WebCryptoKey& key, - const unsigned char* data, - unsigned data_size, - WebKit::WebArrayBuffer* buffer); private: DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl); |