| OLD | NEW |
| 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 #include "base/stl_util.h" | 5 #include "base/stl_util.h" |
| 6 #include "content/child/webcrypto/algorithm_dispatch.h" | 6 #include "components/webcrypto/algorithm_dispatch.h" |
| 7 #include "content/child/webcrypto/crypto_data.h" | 7 #include "components/webcrypto/crypto_data.h" |
| 8 #include "content/child/webcrypto/jwk.h" | 8 #include "components/webcrypto/jwk.h" |
| 9 #include "content/child/webcrypto/status.h" | 9 #include "components/webcrypto/status.h" |
| 10 #include "content/child/webcrypto/test/test_helpers.h" | 10 #include "components/webcrypto/test/test_helpers.h" |
| 11 #include "content/child/webcrypto/webcrypto_util.h" | 11 #include "components/webcrypto/webcrypto_util.h" |
| 12 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" | 12 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" |
| 13 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" | 13 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" |
| 14 | 14 |
| 15 namespace content { | |
| 16 | |
| 17 namespace webcrypto { | 15 namespace webcrypto { |
| 18 | 16 |
| 19 namespace { | 17 namespace { |
| 20 | 18 |
| 21 bool SupportsEcdh() { | 19 bool SupportsEcdh() { |
| 22 #if defined(USE_OPENSSL) | 20 #if defined(USE_OPENSSL) |
| 23 return true; | 21 return true; |
| 24 #else | 22 #else |
| 25 LOG(ERROR) << "Skipping ECDH test because unsupported"; | 23 LOG(ERROR) << "Skipping ECDH test because unsupported"; |
| 26 return false; | 24 return false; |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 CreateEcdhImportAlgorithm(curve), true, 0, &key)); | 350 CreateEcdhImportAlgorithm(curve), true, 0, &key)); |
| 353 EXPECT_EQ(0, key.usages()); | 351 EXPECT_EQ(0, key.usages()); |
| 354 | 352 |
| 355 // Import the private key. | 353 // Import the private key. |
| 356 const base::DictionaryValue* private_key_json = NULL; | 354 const base::DictionaryValue* private_key_json = NULL; |
| 357 EXPECT_TRUE(test->GetDictionary("private_key", &private_key_json)); | 355 EXPECT_TRUE(test->GetDictionary("private_key", &private_key_json)); |
| 358 curve = GetCurveNameFromDictionary(private_key_json); | 356 curve = GetCurveNameFromDictionary(private_key_json); |
| 359 ASSERT_EQ(Status::ErrorCreateKeyEmptyUsages(), | 357 ASSERT_EQ(Status::ErrorCreateKeyEmptyUsages(), |
| 360 ImportKey(blink::WebCryptoKeyFormatJwk, | 358 ImportKey(blink::WebCryptoKeyFormatJwk, |
| 361 CryptoData(MakeJsonVector(*private_key_json)), | 359 CryptoData(MakeJsonVector(*private_key_json)), |
| 362 CreateEcdhImportAlgorithm(curve), true, | 360 CreateEcdhImportAlgorithm(curve), true, 0, &key)); |
| 363 0, &key)); | |
| 364 } | 361 } |
| 365 | 362 |
| 366 } // namespace | 363 } // namespace |
| 367 | 364 |
| 368 } // namespace webcrypto | 365 } // namespace webcrypto |
| 369 | |
| 370 } // namespace content | |
| OLD | NEW |