projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
modules
/
crypto
/
SubtleCrypto.cpp
diff --git
a/src/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp
b/src/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp
index
ca705a8
..
02b9e19
100644
(file)
--- a/
src/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp
+++ b/
src/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp
@@
-31,10
+31,10
@@
#include "config.h"
#include "modules/crypto/SubtleCrypto.h"
#include "config.h"
#include "modules/crypto/SubtleCrypto.h"
-#include "bindings/v8/Dictionary.h"
+#include "bindings/
core/
v8/Dictionary.h"
#include "core/dom/ExecutionContext.h"
#include "core/dom/ExecutionContext.h"
+#include "modules/crypto/CryptoKey.h"
#include "modules/crypto/CryptoResultImpl.h"
#include "modules/crypto/CryptoResultImpl.h"
-#include "modules/crypto/Key.h"
#include "modules/crypto/NormalizeAlgorithm.h"
#include "platform/JSONValues.h"
#include "public/platform/Platform.h"
#include "modules/crypto/NormalizeAlgorithm.h"
#include "platform/JSONValues.h"
#include "public/platform/Platform.h"
@@
-42,7
+42,7
@@
#include "public/platform/WebCryptoAlgorithm.h"
#include "wtf/ArrayBufferView.h"
#include "public/platform/WebCryptoAlgorithm.h"
#include "wtf/ArrayBufferView.h"
-namespace
WebCore
{
+namespace
blink
{
// Seems like the generated bindings should take care of these however it
// currently doesn't. See also http://crbug.com/264520
// Seems like the generated bindings should take care of these however it
// currently doesn't. See also http://crbug.com/264520
@@
-50,23
+50,23
@@
static bool ensureNotNull(const ArrayPiece& x, const char* paramName, CryptoResu
{
if (x.isNull()) {
String message = String("Invalid ") + paramName + String(" argument");
{
if (x.isNull()) {
String message = String("Invalid ") + paramName + String(" argument");
- result->completeWithError(
blink::WebCryptoErrorTypeType, blink::
WebString(message));
+ result->completeWithError(
WebCryptoErrorTypeType,
WebString(message));
return false;
}
return true;
}
return false;
}
return true;
}
-static bool ensureNotNull(Key* key, const char* paramName, CryptoResult* result)
+static bool ensureNotNull(
Crypto
Key* key, const char* paramName, CryptoResult* result)
{
if (!key) {
String message = String("Invalid ") + paramName + String(" argument");
{
if (!key) {
String message = String("Invalid ") + paramName + String(" argument");
- result->completeWithError(
blink::WebCryptoErrorTypeType, blink::
WebString(message));
+ result->completeWithError(
WebCryptoErrorTypeType,
WebString(message));
return false;
}
return true;
}
return false;
}
return true;
}
-static bool parseAlgorithm(const Dictionary& raw,
blink::WebCryptoOperation op, blink::
WebCryptoAlgorithm& algorithm, CryptoResult* result)
+static bool parseAlgorithm(const Dictionary& raw,
WebCryptoOperation op,
WebCryptoAlgorithm& algorithm, CryptoResult* result)
{
AlgorithmError error;
bool success = normalizeAlgorithm(raw, op, algorithm, &error);
{
AlgorithmError error;
bool success = normalizeAlgorithm(raw, op, algorithm, &error);
@@
-78,15
+78,16
@@
static bool parseAlgorithm(const Dictionary& raw, blink::WebCryptoOperation op,
static bool canAccessWebCrypto(ScriptState* scriptState, CryptoResult* result)
{
const SecurityOrigin* origin = scriptState->executionContext()->securityOrigin();
static bool canAccessWebCrypto(ScriptState* scriptState, CryptoResult* result)
{
const SecurityOrigin* origin = scriptState->executionContext()->securityOrigin();
- if (!origin->canAccessFeatureRequiringSecureOrigin()) {
- result->completeWithError(blink::WebCryptoErrorTypeNotSupported, "WebCrypto is only supported over secure origins. See http://crbug.com/373032");
+ String errorMessage;
+ if (!origin->canAccessFeatureRequiringSecureOrigin(errorMessage)) {
+ result->completeWithError(WebCryptoErrorTypeNotSupported, errorMessage);
return false;
}
return true;
}
return false;
}
return true;
}
-static ScriptPromise startCryptoOperation(ScriptState* scriptState, const Dictionary& rawAlgorithm,
Key* key, blink::
WebCryptoOperation operationType, const ArrayPiece& signature, const ArrayPiece& dataBuffer)
+static ScriptPromise startCryptoOperation(ScriptState* scriptState, const Dictionary& rawAlgorithm,
CryptoKey* key,
WebCryptoOperation operationType, const ArrayPiece& signature, const ArrayPiece& dataBuffer)
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
@@
-94,16
+95,16
@@
static ScriptPromise startCryptoOperation(ScriptState* scriptState, const Dictio
if (!canAccessWebCrypto(scriptState, result.get()))
return promise;
if (!canAccessWebCrypto(scriptState, result.get()))
return promise;
- bool requiresKey = operationType !=
blink::
WebCryptoOperationDigest;
+ bool requiresKey = operationType != WebCryptoOperationDigest;
if (requiresKey && !ensureNotNull(key, "key", result.get()))
return promise;
if (requiresKey && !ensureNotNull(key, "key", result.get()))
return promise;
- if (operationType ==
blink::
WebCryptoOperationVerify && !ensureNotNull(signature, "signature", result.get()))
+ if (operationType == WebCryptoOperationVerify && !ensureNotNull(signature, "signature", result.get()))
return promise;
if (!ensureNotNull(dataBuffer, "dataBuffer", result.get()))
return promise;
return promise;
if (!ensureNotNull(dataBuffer, "dataBuffer", result.get()))
return promise;
-
blink::
WebCryptoAlgorithm algorithm;
+ WebCryptoAlgorithm algorithm;
if (!parseAlgorithm(rawAlgorithm, operationType, algorithm, result.get()))
return promise;
if (!parseAlgorithm(rawAlgorithm, operationType, algorithm, result.get()))
return promise;
@@
-114,20
+115,20
@@
static ScriptPromise startCryptoOperation(ScriptState* scriptState, const Dictio
unsigned dataSize = dataBuffer.byteLength();
switch (operationType) {
unsigned dataSize = dataBuffer.byteLength();
switch (operationType) {
- case
blink::
WebCryptoOperationEncrypt:
-
blink::
Platform::current()->crypto()->encrypt(algorithm, key->key(), data, dataSize, result->result());
+ case WebCryptoOperationEncrypt:
+ Platform::current()->crypto()->encrypt(algorithm, key->key(), data, dataSize, result->result());
break;
break;
- case
blink::
WebCryptoOperationDecrypt:
-
blink::
Platform::current()->crypto()->decrypt(algorithm, key->key(), data, dataSize, result->result());
+ case WebCryptoOperationDecrypt:
+ Platform::current()->crypto()->decrypt(algorithm, key->key(), data, dataSize, result->result());
break;
break;
- case
blink::
WebCryptoOperationSign:
-
blink::
Platform::current()->crypto()->sign(algorithm, key->key(), data, dataSize, result->result());
+ case WebCryptoOperationSign:
+ Platform::current()->crypto()->sign(algorithm, key->key(), data, dataSize, result->result());
break;
break;
- case
blink::
WebCryptoOperationVerify:
-
blink::
Platform::current()->crypto()->verifySignature(algorithm, key->key(), signature.bytes(), signature.byteLength(), data, dataSize, result->result());
+ case WebCryptoOperationVerify:
+ Platform::current()->crypto()->verifySignature(algorithm, key->key(), signature.bytes(), signature.byteLength(), data, dataSize, result->result());
break;
break;
- case
blink::
WebCryptoOperationDigest:
-
blink::
Platform::current()->crypto()->digest(algorithm, data, dataSize, result->result());
+ case WebCryptoOperationDigest:
+ Platform::current()->crypto()->digest(algorithm, data, dataSize, result->result());
break;
default:
ASSERT_NOT_REACHED();
break;
default:
ASSERT_NOT_REACHED();
@@
-140,7
+141,7
@@
static ScriptPromise startCryptoOperation(ScriptState* scriptState, const Dictio
static bool copyStringProperty(const char* property, const Dictionary& source, JSONObject* destination)
{
String value;
static bool copyStringProperty(const char* property, const Dictionary& source, JSONObject* destination)
{
String value;
- if (!
source.get(
property, value))
+ if (!
DictionaryHelper::get(source,
property, value))
return false;
destination->setString(property, value);
return true;
return false;
destination->setString(property, value);
return true;
@@
-149,7
+150,7
@@
static bool copyStringProperty(const char* property, const Dictionary& source, J
static bool copySequenceOfStringProperty(const char* property, const Dictionary& source, JSONObject* destination)
{
Vector<String> value;
static bool copySequenceOfStringProperty(const char* property, const Dictionary& source, JSONObject* destination)
{
Vector<String> value;
- if (!
source.get(
property, value))
+ if (!
DictionaryHelper::get(source,
property, value))
return false;
RefPtr<JSONArray> jsonArray = JSONArray::create();
for (unsigned i = 0; i < value.size(); ++i)
return false;
RefPtr<JSONArray> jsonArray = JSONArray::create();
for (unsigned i = 0; i < value.size(); ++i)
@@
-167,7
+168,7
@@
static bool copyJwkDictionaryToJson(const Dictionary& dict, CString& jsonUtf8, C
RefPtr<JSONObject> jsonObject = JSONObject::create();
if (!copyStringProperty("kty", dict, jsonObject.get())) {
RefPtr<JSONObject> jsonObject = JSONObject::create();
if (!copyStringProperty("kty", dict, jsonObject.get())) {
- result->completeWithError(
blink::
WebCryptoErrorTypeData, "The required JWK property \"kty\" was missing");
+ result->completeWithError(WebCryptoErrorTypeData, "The required JWK property \"kty\" was missing");
return false;
}
return false;
}
@@
-176,7
+177,7
@@
static bool copyJwkDictionaryToJson(const Dictionary& dict, CString& jsonUtf8, C
copyStringProperty("alg", dict, jsonObject.get());
bool ext;
copyStringProperty("alg", dict, jsonObject.get());
bool ext;
- if (
dict.get(
"ext", ext))
+ if (
DictionaryHelper::get(dict,
"ext", ext))
jsonObject->setBoolean("ext", ext);
const char* const propertyNames[] = { "d", "n", "e", "p", "q", "dp", "dq", "qi", "k" };
jsonObject->setBoolean("ext", ext);
const char* const propertyNames[] = { "d", "n", "e", "p", "q", "dp", "dq", "qi", "k" };
@@
-193,29
+194,29
@@
SubtleCrypto::SubtleCrypto()
ScriptWrappable::init(this);
}
ScriptWrappable::init(this);
}
-ScriptPromise SubtleCrypto::encrypt(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& data)
+ScriptPromise SubtleCrypto::encrypt(ScriptState* scriptState, const Dictionary& rawAlgorithm,
Crypto
Key* key, const ArrayPiece& data)
{
{
- return startCryptoOperation(scriptState, rawAlgorithm, key,
blink::
WebCryptoOperationEncrypt, ArrayPiece(), data);
+ return startCryptoOperation(scriptState, rawAlgorithm, key, WebCryptoOperationEncrypt, ArrayPiece(), data);
}
}
-ScriptPromise SubtleCrypto::decrypt(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& data)
+ScriptPromise SubtleCrypto::decrypt(ScriptState* scriptState, const Dictionary& rawAlgorithm,
Crypto
Key* key, const ArrayPiece& data)
{
{
- return startCryptoOperation(scriptState, rawAlgorithm, key,
blink::
WebCryptoOperationDecrypt, ArrayPiece(), data);
+ return startCryptoOperation(scriptState, rawAlgorithm, key, WebCryptoOperationDecrypt, ArrayPiece(), data);
}
}
-ScriptPromise SubtleCrypto::sign(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& data)
+ScriptPromise SubtleCrypto::sign(ScriptState* scriptState, const Dictionary& rawAlgorithm,
Crypto
Key* key, const ArrayPiece& data)
{
{
- return startCryptoOperation(scriptState, rawAlgorithm, key,
blink::
WebCryptoOperationSign, ArrayPiece(), data);
+ return startCryptoOperation(scriptState, rawAlgorithm, key, WebCryptoOperationSign, ArrayPiece(), data);
}
}
-ScriptPromise SubtleCrypto::verifySignature(ScriptState* scriptState, const Dictionary& rawAlgorithm, Key* key, const ArrayPiece& signature, const ArrayPiece& data)
+ScriptPromise SubtleCrypto::verifySignature(ScriptState* scriptState, const Dictionary& rawAlgorithm,
Crypto
Key* key, const ArrayPiece& signature, const ArrayPiece& data)
{
{
- return startCryptoOperation(scriptState, rawAlgorithm, key,
blink::
WebCryptoOperationVerify, signature, data);
+ return startCryptoOperation(scriptState, rawAlgorithm, key, WebCryptoOperationVerify, signature, data);
}
ScriptPromise SubtleCrypto::digest(ScriptState* scriptState, const Dictionary& rawAlgorithm, const ArrayPiece& data)
{
}
ScriptPromise SubtleCrypto::digest(ScriptState* scriptState, const Dictionary& rawAlgorithm, const ArrayPiece& data)
{
- return startCryptoOperation(scriptState, rawAlgorithm, 0,
blink::
WebCryptoOperationDigest, ArrayPiece(), data);
+ return startCryptoOperation(scriptState, rawAlgorithm, 0, WebCryptoOperationDigest, ArrayPiece(), data);
}
ScriptPromise SubtleCrypto::generateKey(ScriptState* scriptState, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
}
ScriptPromise SubtleCrypto::generateKey(ScriptState* scriptState, const Dictionary& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
@@
-226,15
+227,15
@@
ScriptPromise SubtleCrypto::generateKey(ScriptState* scriptState, const Dictiona
if (!canAccessWebCrypto(scriptState, result.get()))
return promise;
if (!canAccessWebCrypto(scriptState, result.get()))
return promise;
-
blink::
WebCryptoKeyUsageMask keyUsages;
- if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
+ WebCryptoKeyUsageMask keyUsages;
+ if (!
Crypto
Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
return promise;
return promise;
-
blink::
WebCryptoAlgorithm algorithm;
- if (!parseAlgorithm(rawAlgorithm,
blink::
WebCryptoOperationGenerateKey, algorithm, result.get()))
+ WebCryptoAlgorithm algorithm;
+ if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationGenerateKey, algorithm, result.get()))
return promise;
return promise;
-
blink::
Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
+ Platform::current()->crypto()->generateKey(algorithm, extractable, keyUsages, result->result());
return promise;
}
return promise;
}
@@
-249,24
+250,24
@@
ScriptPromise SubtleCrypto::importKey(ScriptState* scriptState, const String& ra
if (!ensureNotNull(keyData, "keyData", result.get()))
return promise;
if (!ensureNotNull(keyData, "keyData", result.get()))
return promise;
-
blink::
WebCryptoKeyFormat format;
- if (!Key::parseFormat(rawFormat, format, result.get()))
+ WebCryptoKeyFormat format;
+ if (!
Crypto
Key::parseFormat(rawFormat, format, result.get()))
return promise;
return promise;
- if (format ==
blink::
WebCryptoKeyFormatJwk) {
- result->completeWithError(
blink::
WebCryptoErrorTypeData, "Key data must be an object for JWK import");
+ if (format == WebCryptoKeyFormatJwk) {
+ result->completeWithError(WebCryptoErrorTypeData, "Key data must be an object for JWK import");
return promise;
}
return promise;
}
-
blink::
WebCryptoKeyUsageMask keyUsages;
- if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
+ WebCryptoKeyUsageMask keyUsages;
+ if (!
Crypto
Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
return promise;
return promise;
-
blink::
WebCryptoAlgorithm algorithm;
- if (!parseAlgorithm(rawAlgorithm,
blink::
WebCryptoOperationImportKey, algorithm, result.get()))
+ WebCryptoAlgorithm algorithm;
+ if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationImportKey, algorithm, result.get()))
return promise;
return promise;
-
blink::
Platform::current()->crypto()->importKey(format, keyData.bytes(), keyData.byteLength(), algorithm, extractable, keyUsages, result->result());
+ Platform::current()->crypto()->importKey(format, keyData.bytes(), keyData.byteLength(), algorithm, extractable, keyUsages, result->result());
return promise;
}
return promise;
}
@@
-278,32
+279,32
@@
ScriptPromise SubtleCrypto::importKey(ScriptState* scriptState, const String& ra
if (!canAccessWebCrypto(scriptState, result.get()))
return promise;
if (!canAccessWebCrypto(scriptState, result.get()))
return promise;
-
blink::
WebCryptoKeyFormat format;
- if (!Key::parseFormat(rawFormat, format, result.get()))
+ WebCryptoKeyFormat format;
+ if (!
Crypto
Key::parseFormat(rawFormat, format, result.get()))
return promise;
return promise;
-
blink::
WebCryptoKeyUsageMask keyUsages;
- if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
+ WebCryptoKeyUsageMask keyUsages;
+ if (!
Crypto
Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
return promise;
return promise;
- if (format !=
blink::
WebCryptoKeyFormatJwk) {
- result->completeWithError(
blink::
WebCryptoErrorTypeData, "Key data must be a buffer for non-JWK formats");
+ if (format != WebCryptoKeyFormatJwk) {
+ result->completeWithError(WebCryptoErrorTypeData, "Key data must be a buffer for non-JWK formats");
return promise;
}
return promise;
}
-
blink::
WebCryptoAlgorithm algorithm;
- if (!parseAlgorithm(rawAlgorithm,
blink::
WebCryptoOperationImportKey, algorithm, result.get()))
+ WebCryptoAlgorithm algorithm;
+ if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationImportKey, algorithm, result.get()))
return promise;
CString jsonUtf8;
if (!copyJwkDictionaryToJson(keyData, jsonUtf8, result.get()))
return promise;
return promise;
CString jsonUtf8;
if (!copyJwkDictionaryToJson(keyData, jsonUtf8, result.get()))
return promise;
-
blink::
Platform::current()->crypto()->importKey(format, reinterpret_cast<const unsigned char*>(jsonUtf8.data()), jsonUtf8.length(), algorithm, extractable, keyUsages, result->result());
+ Platform::current()->crypto()->importKey(format, reinterpret_cast<const unsigned char*>(jsonUtf8.data()), jsonUtf8.length(), algorithm, extractable, keyUsages, result->result());
return promise;
}
return promise;
}
-ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& rawFormat, Key* key)
+ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& rawFormat,
Crypto
Key* key)
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
@@
-314,20
+315,20
@@
ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& ra
if (!ensureNotNull(key, "key", result.get()))
return promise;
if (!ensureNotNull(key, "key", result.get()))
return promise;
-
blink::
WebCryptoKeyFormat format;
- if (!Key::parseFormat(rawFormat, format, result.get()))
+ WebCryptoKeyFormat format;
+ if (!
Crypto
Key::parseFormat(rawFormat, format, result.get()))
return promise;
if (!key->extractable()) {
return promise;
if (!key->extractable()) {
- result->completeWithError(
blink::
WebCryptoErrorTypeInvalidAccess, "key is not extractable");
+ result->completeWithError(WebCryptoErrorTypeInvalidAccess, "key is not extractable");
return promise;
}
return promise;
}
-
blink::
Platform::current()->crypto()->exportKey(format, key->key(), result->result());
+ Platform::current()->crypto()->exportKey(format, key->key(), result->result());
return promise;
}
return promise;
}
-ScriptPromise SubtleCrypto::wrapKey(ScriptState* scriptState, const String& rawFormat,
Key* key,
Key* wrappingKey, const Dictionary& rawWrapAlgorithm)
+ScriptPromise SubtleCrypto::wrapKey(ScriptState* scriptState, const String& rawFormat,
CryptoKey* key, Crypto
Key* wrappingKey, const Dictionary& rawWrapAlgorithm)
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
@@
-341,27
+342,27
@@
ScriptPromise SubtleCrypto::wrapKey(ScriptState* scriptState, const String& rawF
if (!ensureNotNull(wrappingKey, "wrappingKey", result.get()))
return promise;
if (!ensureNotNull(wrappingKey, "wrappingKey", result.get()))
return promise;
-
blink::
WebCryptoKeyFormat format;
- if (!Key::parseFormat(rawFormat, format, result.get()))
+ WebCryptoKeyFormat format;
+ if (!
Crypto
Key::parseFormat(rawFormat, format, result.get()))
return promise;
return promise;
-
blink::
WebCryptoAlgorithm wrapAlgorithm;
- if (!parseAlgorithm(rawWrapAlgorithm,
blink::
WebCryptoOperationWrapKey, wrapAlgorithm, result.get()))
+ WebCryptoAlgorithm wrapAlgorithm;
+ if (!parseAlgorithm(rawWrapAlgorithm, WebCryptoOperationWrapKey, wrapAlgorithm, result.get()))
return promise;
if (!key->extractable()) {
return promise;
if (!key->extractable()) {
- result->completeWithError(
blink::
WebCryptoErrorTypeInvalidAccess, "key is not extractable");
+ result->completeWithError(WebCryptoErrorTypeInvalidAccess, "key is not extractable");
return promise;
}
return promise;
}
- if (!wrappingKey->canBeUsedForAlgorithm(wrapAlgorithm,
blink::
WebCryptoOperationWrapKey, result.get()))
+ if (!wrappingKey->canBeUsedForAlgorithm(wrapAlgorithm, WebCryptoOperationWrapKey, result.get()))
return promise;
return promise;
-
blink::
Platform::current()->crypto()->wrapKey(format, key->key(), wrappingKey->key(), wrapAlgorithm, result->result());
+ Platform::current()->crypto()->wrapKey(format, key->key(), wrappingKey->key(), wrapAlgorithm, result->result());
return promise;
}
return promise;
}
-ScriptPromise SubtleCrypto::unwrapKey(ScriptState* scriptState, const String& rawFormat, const ArrayPiece& wrappedKey, Key* unwrappingKey, const Dictionary& rawUnwrapAlgorithm, const Dictionary& rawUnwrappedKeyAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
+ScriptPromise SubtleCrypto::unwrapKey(ScriptState* scriptState, const String& rawFormat, const ArrayPiece& wrappedKey,
Crypto
Key* unwrappingKey, const Dictionary& rawUnwrapAlgorithm, const Dictionary& rawUnwrappedKeyAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
{
RefPtr<CryptoResultImpl> result = CryptoResultImpl::create(scriptState);
ScriptPromise promise = result->promise();
@@
-374,27
+375,27
@@
ScriptPromise SubtleCrypto::unwrapKey(ScriptState* scriptState, const String& ra
if (!ensureNotNull(unwrappingKey, "unwrappingKey", result.get()))
return promise;
if (!ensureNotNull(unwrappingKey, "unwrappingKey", result.get()))
return promise;
-
blink::
WebCryptoKeyFormat format;
- if (!Key::parseFormat(rawFormat, format, result.get()))
+ WebCryptoKeyFormat format;
+ if (!
Crypto
Key::parseFormat(rawFormat, format, result.get()))
return promise;
return promise;
-
blink::
WebCryptoKeyUsageMask keyUsages;
- if (!Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
+ WebCryptoKeyUsageMask keyUsages;
+ if (!
Crypto
Key::parseUsageMask(rawKeyUsages, keyUsages, result.get()))
return promise;
return promise;
-
blink::
WebCryptoAlgorithm unwrapAlgorithm;
- if (!parseAlgorithm(rawUnwrapAlgorithm,
blink::
WebCryptoOperationUnwrapKey, unwrapAlgorithm, result.get()))
+ WebCryptoAlgorithm unwrapAlgorithm;
+ if (!parseAlgorithm(rawUnwrapAlgorithm, WebCryptoOperationUnwrapKey, unwrapAlgorithm, result.get()))
return promise;
return promise;
-
blink::
WebCryptoAlgorithm unwrappedKeyAlgorithm;
- if (!parseAlgorithm(rawUnwrappedKeyAlgorithm,
blink::
WebCryptoOperationImportKey, unwrappedKeyAlgorithm, result.get()))
+ WebCryptoAlgorithm unwrappedKeyAlgorithm;
+ if (!parseAlgorithm(rawUnwrappedKeyAlgorithm, WebCryptoOperationImportKey, unwrappedKeyAlgorithm, result.get()))
return promise;
return promise;
- if (!unwrappingKey->canBeUsedForAlgorithm(unwrapAlgorithm,
blink::
WebCryptoOperationUnwrapKey, result.get()))
+ if (!unwrappingKey->canBeUsedForAlgorithm(unwrapAlgorithm, WebCryptoOperationUnwrapKey, result.get()))
return promise;
return promise;
-
blink::
Platform::current()->crypto()->unwrapKey(format, wrappedKey.bytes(), wrappedKey.byteLength(), unwrappingKey->key(), unwrapAlgorithm, unwrappedKeyAlgorithm, extractable, keyUsages, result->result());
+ Platform::current()->crypto()->unwrapKey(format, wrappedKey.bytes(), wrappedKey.byteLength(), unwrappingKey->key(), unwrapAlgorithm, unwrappedKeyAlgorithm, extractable, keyUsages, result->result());
return promise;
}
return promise;
}
-} // namespace
WebCore
+} // namespace
blink