| 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 <openssl/ec.h> | 5 #include <openssl/ec.h> |
| 6 #include <openssl/ecdh.h> | 6 #include <openssl/ecdh.h> |
| 7 #include <openssl/evp.h> | 7 #include <openssl/evp.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 11 #include "content/child/webcrypto/algorithm_implementation.h" | 11 #include "components/webcrypto/algorithm_implementation.h" |
| 12 #include "content/child/webcrypto/crypto_data.h" | 12 #include "components/webcrypto/crypto_data.h" |
| 13 #include "content/child/webcrypto/generate_key_result.h" | 13 #include "components/webcrypto/generate_key_result.h" |
| 14 #include "content/child/webcrypto/openssl/ec_algorithm_openssl.h" | 14 #include "components/webcrypto/openssl/ec_algorithm_openssl.h" |
| 15 #include "content/child/webcrypto/openssl/key_openssl.h" | 15 #include "components/webcrypto/openssl/key_openssl.h" |
| 16 #include "content/child/webcrypto/openssl/util_openssl.h" | 16 #include "components/webcrypto/openssl/util_openssl.h" |
| 17 #include "content/child/webcrypto/status.h" | 17 #include "components/webcrypto/status.h" |
| 18 #include "content/child/webcrypto/webcrypto_util.h" | 18 #include "components/webcrypto/webcrypto_util.h" |
| 19 #include "crypto/openssl_util.h" | 19 #include "crypto/openssl_util.h" |
| 20 #include "crypto/scoped_openssl_types.h" | 20 #include "crypto/scoped_openssl_types.h" |
| 21 #include "crypto/secure_util.h" | 21 #include "crypto/secure_util.h" |
| 22 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" | 22 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" |
| 23 #include "third_party/WebKit/public/platform/WebCryptoKey.h" | 23 #include "third_party/WebKit/public/platform/WebCryptoKey.h" |
| 24 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" | 24 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" |
| 25 | 25 |
| 26 namespace content { | |
| 27 | |
| 28 namespace webcrypto { | 26 namespace webcrypto { |
| 29 | 27 |
| 30 namespace { | 28 namespace { |
| 31 | 29 |
| 32 // TODO(eroman): Support the "raw" format for ECDH key import + export, as | 30 // TODO(eroman): Support the "raw" format for ECDH key import + export, as |
| 33 // specified by WebCrypto spec. | 31 // specified by WebCrypto spec. |
| 34 | 32 |
| 35 // TODO(eroman): Allow id-ecDH in SPKI and PKCS#8 import | 33 // TODO(eroman): Allow id-ecDH in SPKI and PKCS#8 import |
| 36 // (http://crbug.com/389400) | 34 // (http://crbug.com/389400) |
| 37 | 35 |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 } | 124 } |
| 127 }; | 125 }; |
| 128 | 126 |
| 129 } // namespace | 127 } // namespace |
| 130 | 128 |
| 131 AlgorithmImplementation* CreatePlatformEcdhImplementation() { | 129 AlgorithmImplementation* CreatePlatformEcdhImplementation() { |
| 132 return new EcdhImplementation; | 130 return new EcdhImplementation; |
| 133 } | 131 } |
| 134 | 132 |
| 135 } // namespace webcrypto | 133 } // namespace webcrypto |
| 136 | |
| 137 } // namespace content | |
| OLD | NEW |