| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/crypto/AesCbcParams.h" | 32 #include "modules/crypto/KeyPair.h" |
| 33 | 33 |
| 34 #include "public/platform/WebCryptoAlgorithmParams.h" | 34 #include "modules/crypto/Key.h" |
| 35 #include "public/platform/WebCryptoKey.h" |
| 35 | 36 |
| 36 namespace WebCore { | 37 namespace WebCore { |
| 37 | 38 |
| 38 Uint8Array* AesCbcParams::iv() | 39 PassRefPtr<KeyPair> KeyPair::create(const WebKit::WebCryptoKey& publicKey, const
WebKit::WebCryptoKey& privateKey) |
| 39 { | 40 { |
| 40 if (!m_iv) { | 41 ASSERT(publicKey.type() == WebKit::WebCryptoKeyTypePublic); |
| 41 const WebKit::WebVector<unsigned char>& iv = m_algorithm.aesCbcParams()-
>iv(); | 42 ASSERT(privateKey.type() == WebKit::WebCryptoKeyTypePrivate); |
| 42 m_iv = Uint8Array::create(iv.data(), iv.size()); | 43 return adoptRef(new KeyPair(Key::create(publicKey), Key::create(privateKey))
); |
| 43 } | |
| 44 return m_iv.get(); | |
| 45 } | 44 } |
| 46 | 45 |
| 47 AesCbcParams::AesCbcParams(const WebKit::WebCryptoAlgorithm& algorithm) | 46 KeyPair::KeyPair(const PassRefPtr<Key>& publicKey, const PassRefPtr<Key>& privat
eKey) |
| 48 : Algorithm(algorithm) | 47 : m_publicKey(publicKey) |
| 48 , m_privateKey(privateKey) |
| 49 { | 49 { |
| 50 ASSERT(algorithm.aesCbcParams()); | 50 ASSERT(publicKey); |
| 51 ASSERT(privateKey); |
| 51 ScriptWrappable::init(this); | 52 ScriptWrappable::init(this); |
| 52 } | 53 } |
| 53 | 54 |
| 54 } // namespace WebCore | 55 } // namespace WebCore |
| OLD | NEW |