Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: Source/modules/crypto/SubtleCrypto.cpp

Issue 20475004: WebCrypto: Properly normalize algorithm for importKey(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/crypto/NormalizeAlgorithm.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 return ScriptObject(); 160 return ScriptObject();
161 } 161 }
162 162
163 WebKit::WebCryptoKeyFormat format; 163 WebKit::WebCryptoKeyFormat format;
164 if (!Key::parseFormat(rawFormat, format)) { 164 if (!Key::parseFormat(rawFormat, format)) {
165 es.throwDOMException(TypeError); 165 es.throwDOMException(TypeError);
166 return ScriptObject(); 166 return ScriptObject();
167 } 167 }
168 168
169 WebKit::WebCryptoAlgorithm algorithm; 169 WebKit::WebCryptoAlgorithm algorithm;
170 if (!normalizeAlgorithmForImportKey(rawAlgorithm, algorithm, es)) 170 if (!normalizeAlgorithm(rawAlgorithm, ImportKey, algorithm, es))
171 return ScriptObject(); 171 return ScriptObject();
172 172
173 const unsigned char* keyDataBytes = static_cast<unsigned char*>(keyData->bas eAddress()); 173 const unsigned char* keyDataBytes = static_cast<unsigned char*>(keyData->bas eAddress());
174 174
175 RefPtr<KeyOperation> keyOp = KeyOperation::create(); 175 RefPtr<KeyOperation> keyOp = KeyOperation::create();
176 WebKit::WebCryptoKeyOperationResult result(keyOp.get()); 176 WebKit::WebCryptoKeyOperationResult result(keyOp.get());
177 platformCrypto->importKey(format, keyDataBytes, keyData->byteLength(), algor ithm, extractable, keyUsages, result); 177 platformCrypto->importKey(format, keyDataBytes, keyData->byteLength(), algor ithm, extractable, keyUsages, result);
178 return keyOp->returnValue(es); 178 return keyOp->returnValue(es);
179 } 179 }
180 180
181 } // namespace WebCore 181 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/crypto/NormalizeAlgorithm.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698