diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 02:00:26 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 02:00:26 +0000 |
| commit | 82ca1533fccfa2beec6bbedab766231e970e61b7 (patch) | |
| tree | 6d4e5167293b3c62f57957e86e42fe89efdc21ab /content/child/webcrypto/webcrypto_impl.cc | |
| parent | 991229a388e96585d2649958ef47b1ee953018ef (diff) | |
| download | chromium_src-82ca1533fccfa2beec6bbedab766231e970e61b7.zip chromium_src-82ca1533fccfa2beec6bbedab766231e970e61b7.tar.gz chromium_src-82ca1533fccfa2beec6bbedab766231e970e61b7.tar.bz2 | |
[refactor] Change ordering of wrapkey parameters
crypto.subtle.wrapKey() orders the key to be wrapped before the wrapping key. Use the same convention throughout webcrypto code to avoid confusion.
BUG=245025
Review URL: https://codereview.chromium.org/272033003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/webcrypto/webcrypto_impl.cc')
| -rw-r--r-- | content/child/webcrypto/webcrypto_impl.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/content/child/webcrypto/webcrypto_impl.cc b/content/child/webcrypto/webcrypto_impl.cc index 8891689..04e031b 100644 --- a/content/child/webcrypto/webcrypto_impl.cc +++ b/content/child/webcrypto/webcrypto_impl.cc @@ -519,11 +519,9 @@ void DoWrapKeyReply(scoped_ptr<WrapKeyState> state) { void DoWrapKey(scoped_ptr<WrapKeyState> passed_state) { WrapKeyState* state = passed_state.get(); - // TODO(eroman): The parameter ordering of webcrypto::WrapKey() is - // inconsistent with that of blink::WebCrypto::wrapKey(). state->status = webcrypto::WrapKey(state->format, - state->wrapping_key, state->key, + state->wrapping_key, state->wrap_algorithm, &state->buffer); |