Transfer WebCrypto databuffers across the Blink API using blink::WebVector.

third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "core/dom/ExecutionContext.h"
 #include "modules/crypto/CryptoHistograms.h"
 #include "modules/crypto/CryptoKey.h"
 #include "modules/crypto/CryptoResultImpl.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
 #include "platform/JSONValues.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCrypto.h"
 #include "public/platform/WebCryptoAlgorithm.h"
 
-// TODO(eroman): Change the public blink::WebCrypto interface to allow
-//               transferring ownership of data buffers instead of just taking
-//               a raw pointer+length. This will avoid an extra copy.
-
 namespace blink {
 
 static bool parseAlgorithm(const AlgorithmIdentifier& raw, WebCryptoOperation op, WebCryptoAlgorithm& algorithm, CryptoResult* result)
 {
     AlgorithmError error;
     bool success = normalizeAlgorithm(raw, op, algorithm, &error);
     if (!success)
         result->completeWithError(error.errorType, error.errorDetails);
     return success;
 }
@@ skipping 27 matching lines @@
     for (unsigned i = 0; i < value.size(); ++i)
         jsonArray->pushString(value[i]);
     destination->setArray(property, jsonArray.release());
     return true;
 }
 
 // FIXME: At the time of writing this is not a part of the spec. It is based an
 // an unpublished editor's draft for:
 //   https://www.w3.org/Bugs/Public/show_bug.cgi?id=24963
 // See http://crbug.com/373917.
-static bool copyJwkDictionaryToJson(const Dictionary& dict, Vector<uint8_t>& jsonUtf8, CryptoResult* result)
+static bool copyJwkDictionaryToJson(const Dictionary& dict, WebVector<uint8_t>& jsonUtf8, CryptoResult* result)
 {
     RefPtr<JSONObject> jsonObject = JSONObject::create();
 
     if (!copyStringProperty("kty", dict, jsonObject.get())) {
         result->completeWithError(WebCryptoErrorTypeData, "The required JWK member \"kty\" was missing");
         return false;
     }
 
     copyStringProperty("use", dict, jsonObject.get());
     copySequenceOfStringProperty("key_ops", dict, jsonObject.get());
     copyStringProperty("alg", dict, jsonObject.get());
 
     bool ext;
     if (DictionaryHelper::get(dict, "ext", ext))
         jsonObject->setBoolean("ext", ext);
 
     const char* const propertyNames[] = { "d", "n", "e", "p", "q", "dp", "dq", "qi", "k", "crv", "x", "y" };
     for (unsigned i = 0; i < WTF_ARRAY_LENGTH(propertyNames); ++i)
         copyStringProperty(propertyNames[i], dict, jsonObject.get());
 
     String json = jsonObject->toJSONString();
-    jsonUtf8.clear();
-    jsonUtf8.append(json.utf8().data(), json.utf8().length());
+    jsonUtf8 = WebVector<uint8_t>(json.utf8().data(), json.utf8().length());
     return true;
 }
 
-static Vector<uint8_t> copyBytes(const DOMArrayPiece& source)
+static WebVector<uint8_t> copyBytes(const DOMArrayPiece& source)
 {
-    Vector<uint8_t> result;
-    result.append(reinterpret_cast<const uint8_t*>(source.data()), source.byteLength());
-    return result;
+    return WebVector<uint8_t>(static_cast<uint8_t*>(source.data()), source.byteLength());
 }
 
 SubtleCrypto::SubtleCrypto()
 {
 }
 
 ScriptPromise SubtleCrypto::encrypt(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const BufferSource& rawData)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#dfn-SubtleCrypto-method-encrypt
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     // 14.3.1.2: Let data be the result of getting a copy of the bytes held by
     //           the data parameter passed to the encrypt method.
-    Vector<uint8_t> data = copyBytes(rawData);
+    WebVector<uint8_t> data = copyBytes(rawData);
 
     // 14.3.1.3: Let normalizedAlgorithm be the result of normalizing an
     //           algorithm, with alg set to algorithm and op set to "encrypt".
     WebCryptoAlgorithm normalizedAlgorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationEncrypt, normalizedAlgorithm, result))
         return promise;
 
     // 14.3.1.8: If the name member of normalizedAlgorithm is not equal to the
     //           name attribute of the [[algorithm]] internal slot of key then
     //           throw an InvalidAccessError.
     //
     // 14.3.1.9: If the [[usages]] internal slot of key does not contain an
     //           entry that is "encrypt", then throw an InvalidAccessError.
     if (!key->canBeUsedForAlgorithm(normalizedAlgorithm, WebCryptoKeyUsageEncrypt, result))
         return promise;
 
     histogramAlgorithmAndKey(scriptState->getExecutionContext(), normalizedAlgorithm, key->key());
-    Platform::current()->crypto()->encrypt(normalizedAlgorithm, key->key(), data.data(), data.size(), result->result());
+    Platform::current()->crypto()->encrypt(normalizedAlgorithm, key->key(), std::move(data), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::decrypt(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const BufferSource& rawData)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#dfn-SubtleCrypto-method-decrypt
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     // 14.3.2.2: Let data be the result of getting a copy of the bytes held by
     //           the data parameter passed to the decrypt method.
-    Vector<uint8_t> data = copyBytes(rawData);
+    WebVector<uint8_t> data = copyBytes(rawData);
 
     // 14.3.2.3: Let normalizedAlgorithm be the result of normalizing an
     //           algorithm, with alg set to algorithm and op set to "decrypt".
     WebCryptoAlgorithm normalizedAlgorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDecrypt, normalizedAlgorithm, result))
         return promise;
 
     // 14.3.2.8: If the name member of normalizedAlgorithm is not equal to the
     //           name attribute of the [[algorithm]] internal slot of key then
     //           throw an InvalidAccessError.
     //
     // 14.3.2.9: If the [[usages]] internal slot of key does not contain an
     //           entry that is "decrypt", then throw an InvalidAccessError.
     if (!key->canBeUsedForAlgorithm(normalizedAlgorithm, WebCryptoKeyUsageDecrypt, result))
         return promise;
 
     histogramAlgorithmAndKey(scriptState->getExecutionContext(), normalizedAlgorithm, key->key());
-    Platform::current()->crypto()->decrypt(normalizedAlgorithm, key->key(), data.data(), data.size(), result->result());
+    Platform::current()->crypto()->decrypt(normalizedAlgorithm, key->key(), std::move(data), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::sign(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const BufferSource& rawData)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#dfn-SubtleCrypto-method-sign
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     // 14.3.3.2: Let data be the result of getting a copy of the bytes held by
     //           the data parameter passed to the sign method.
-    Vector<uint8_t> data = copyBytes(rawData);
+    WebVector<uint8_t> data = copyBytes(rawData);
 
     // 14.3.3.3: Let normalizedAlgorithm be the result of normalizing an
     //           algorithm, with alg set to algorithm and op set to "sign".
     WebCryptoAlgorithm normalizedAlgorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationSign, normalizedAlgorithm, result))
         return promise;
 
     // 14.3.3.8: If the name member of normalizedAlgorithm is not equal to the
     //           name attribute of the [[algorithm]] internal slot of key then
     //           throw an InvalidAccessError.
     //
     // 14.3.3.9: If the [[usages]] internal slot of key does not contain an
     //           entry that is "sign", then throw an InvalidAccessError.
     if (!key->canBeUsedForAlgorithm(normalizedAlgorithm, WebCryptoKeyUsageSign, result))
         return promise;
 
     histogramAlgorithmAndKey(scriptState->getExecutionContext(), normalizedAlgorithm, key->key());
-    Platform::current()->crypto()->sign(normalizedAlgorithm, key->key(), data.data(), data.size(), result->result());
+    Platform::current()->crypto()->sign(normalizedAlgorithm, key->key(), std::move(data), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::verifySignature(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* key, const BufferSource& rawSignature, const BufferSource& rawData)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#SubtleCrypto-method-verify
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     // 14.3.4.2: Let signature be the result of getting a copy of the bytes
     //           held by the signature parameter passed to the verify method.
-    Vector<uint8_t> signature = copyBytes(rawSignature);
+    WebVector<uint8_t> signature = copyBytes(rawSignature);
 
     // 14.3.4.3: Let normalizedAlgorithm be the result of normalizing an
     //           algorithm, with alg set to algorithm and op set to "verify".
     WebCryptoAlgorithm normalizedAlgorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationVerify, normalizedAlgorithm, result))
         return promise;
 
     // 14.3.4.5: Let data be the result of getting a copy of the bytes held by
     //           the data parameter passed to the verify method.
-    Vector<uint8_t> data = copyBytes(rawData);
+    WebVector<uint8_t> data = copyBytes(rawData);
 
     // 14.3.4.9: If the name member of normalizedAlgorithm is not equal to the
     //           name attribute of the [[algorithm]] internal slot of key then throw an
     //           InvalidAccessError.
     //
     // 14.3.4.10: If the [[usages]] internal slot of key does not contain an
     //            entry that is "verify", then throw an InvalidAccessError.
     if (!key->canBeUsedForAlgorithm(normalizedAlgorithm, WebCryptoKeyUsageVerify, result))
         return promise;
 
     histogramAlgorithmAndKey(scriptState->getExecutionContext(), normalizedAlgorithm, key->key());
-    Platform::current()->crypto()->verifySignature(normalizedAlgorithm, key->key(), signature.data(), signature.size(), data.data(), data.size(), result->result());
+    Platform::current()->crypto()->verifySignature(normalizedAlgorithm, key->key(), std::move(signature), std::move(data), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::digest(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, const BufferSource& rawData)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#SubtleCrypto-method-digest
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
     if (!canAccessWebCrypto(scriptState, result))
         return promise;
 
     // 14.3.5.2: Let data be the result of getting a copy of the bytes held
     //              by the data parameter passed to the digest method.
-    Vector<uint8_t> data = copyBytes(rawData);
+    WebVector<uint8_t> data = copyBytes(rawData);
 
     // 14.3.5.3: Let normalizedAlgorithm be the result of normalizing an
     //           algorithm, with alg set to algorithm and op set to "digest".
     WebCryptoAlgorithm normalizedAlgorithm;
     if (!parseAlgorithm(rawAlgorithm, WebCryptoOperationDigest, normalizedAlgorithm, result))
         return promise;
 
     histogramAlgorithm(scriptState->getExecutionContext(), normalizedAlgorithm);
-    Platform::current()->crypto()->digest(normalizedAlgorithm, data.data(), data.size(), result->result());
+    Platform::current()->crypto()->digest(normalizedAlgorithm, std::move(data), result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::generateKey(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, bool extractable, const Vector<String>& rawKeyUsages)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#SubtleCrypto-method-generateKey
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
@@ skipping 50 matching lines @@
     if (rawKeyData.isDictionary()) {
         if (format != WebCryptoKeyFormatJwk) {
             result->completeWithError(WebCryptoErrorTypeType, "Key data must be a buffer for non-JWK formats");
             return promise;
         }
     } else if (format == WebCryptoKeyFormatJwk) {
         result->completeWithError(WebCryptoErrorTypeType, "Key data must be an object for JWK import");
         return promise;
     }
 
-    Vector<uint8_t> keyData;
+    WebVector<uint8_t> keyData;
 
     // TODO(eroman): Match the procedure given in the spec to more
     // easily provide a normative reference.
     if (rawKeyData.isArrayBuffer()) {
         keyData = copyBytes(rawKeyData.getAsArrayBuffer());
     } else if (rawKeyData.isArrayBufferView()) {
         keyData = copyBytes(rawKeyData.getAsArrayBufferView());
     } else if (rawKeyData.isDictionary()) {
         if (!copyJwkDictionaryToJson(rawKeyData.getAsDictionary(), keyData, result))
             return promise;
     }
     histogramAlgorithm(scriptState->getExecutionContext(), normalizedAlgorithm);
-    Platform::current()->crypto()->importKey(format, keyData.data(), keyData.size(), normalizedAlgorithm, extractable, keyUsages, result->result());
+    Platform::current()->crypto()->importKey(format, std::move(keyData), normalizedAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::exportKey(ScriptState* scriptState, const String& rawFormat, CryptoKey* key)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#dfn-SubtleCrypto-method-exportKey
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
@@ skipping 81 matching lines @@
     if (!CryptoKey::parseFormat(rawFormat, format, result))
         return promise;
 
     WebCryptoKeyUsageMask keyUsages;
     if (!CryptoKey::parseUsageMask(rawKeyUsages, keyUsages, result))
         return promise;
 
     // 14.3.12.2: Let wrappedKey be the result of getting a copy of the bytes
     //            held by the wrappedKey parameter passed to the unwrapKey
     //            method.
-    Vector<uint8_t> wrappedKey = copyBytes(rawWrappedKey);
+    WebVector<uint8_t> wrappedKey = copyBytes(rawWrappedKey);
 
     // 14.3.12.3: Let normalizedAlgorithm be the result of normalizing an
     //            algorithm, with alg set to algorithm and op set to
     //            "unwrapKey".
     //
     // 14.3.12.4: If an error occurred, let normalizedAlgorithm be the result
     //            of normalizing an algorithm, with alg set to algorithm and op
     //            set to "decrypt".
     WebCryptoAlgorithm normalizedAlgorithm;
     if (!parseAlgorithm(rawUnwrapAlgorithm, WebCryptoOperationUnwrapKey, normalizedAlgorithm, result))
@@ skipping 15 matching lines @@
     //             InvalidAccessError.
     if (!unwrappingKey->canBeUsedForAlgorithm(normalizedAlgorithm, WebCryptoKeyUsageUnwrapKey, result))
         return promise;
 
     // NOTE: Step (16) disallows empty usages on secret and private keys. This
     // normative requirement is enforced by the platform implementation in the
     // call below.
 
     histogramAlgorithmAndKey(scriptState->getExecutionContext(), normalizedAlgorithm, unwrappingKey->key());
     histogramAlgorithm(scriptState->getExecutionContext(), normalizedKeyAlgorithm);
-    Platform::current()->crypto()->unwrapKey(format, wrappedKey.data(), wrappedKey.size(), unwrappingKey->key(), normalizedAlgorithm, normalizedKeyAlgorithm, extractable, keyUsages, result->result());
+    Platform::current()->crypto()->unwrapKey(format, std::move(wrappedKey), unwrappingKey->key(), normalizedAlgorithm, normalizedKeyAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 ScriptPromise SubtleCrypto::deriveBits(ScriptState* scriptState, const AlgorithmIdentifier& rawAlgorithm, CryptoKey* baseKey, unsigned lengthBits)
 {
     // Method described by: https://w3c.github.io/webcrypto/Overview.html#dfn-SubtleCrypto-method-deriveBits
 
     CryptoResultImpl* result = CryptoResultImpl::create(scriptState);
     ScriptPromise promise = result->promise();
 
@@ skipping 74 matching lines @@
     // normative requirement is enforced by the platform implementation in the
     // call below.
 
     histogramAlgorithmAndKey(scriptState->getExecutionContext(), normalizedAlgorithm, baseKey->key());
     histogramAlgorithm(scriptState->getExecutionContext(), normalizedDerivedKeyAlgorithm);
     Platform::current()->crypto()->deriveKey(normalizedAlgorithm, baseKey->key(), normalizedDerivedKeyAlgorithm, keyLengthAlgorithm, extractable, keyUsages, result->result());
     return promise;
 }
 
 } // namespace blink