| Index: content/child/webcrypto/platform_crypto.h
|
| diff --git a/content/child/webcrypto/platform_crypto.h b/content/child/webcrypto/platform_crypto.h
|
| index 9e957301c01a03d7f8feecac67350a9a8c4cc758..00b9e050a82f835b9c64c22f6c0832ba604f5a72 100644
|
| --- a/content/child/webcrypto/platform_crypto.h
|
| +++ b/content/child/webcrypto/platform_crypto.h
|
| @@ -8,282 +8,32 @@
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebCrypto.h"
|
| -#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
|
| -
|
| -namespace blink {
|
| -template <typename T>
|
| -class WebVector;
|
| -}
|
|
|
| +// The definitions for these methods lives in either nss/ or openssl/
|
| namespace content {
|
|
|
| -enum EncryptOrDecrypt { ENCRYPT, DECRYPT };
|
| -
|
| namespace webcrypto {
|
|
|
| -class CryptoData;
|
| -class Status;
|
| -
|
| -// Functions in the webcrypto::platform namespace are intended to be those
|
| -// which are OpenSSL/NSS specific.
|
| -//
|
| -// The general purpose code which applies to both OpenSSL and NSS
|
| -// implementations of webcrypto should live in the outter webcrypto namespace,
|
| -// and the crypto library specific bits in the "platform" namespace.
|
| -//
|
| -// -----------------
|
| -// Threading:
|
| -// -----------------
|
| -//
|
| -// Unless otherwise noted, functions in webcrypto::platform are called
|
| -// exclusively from a sequenced worker pool.
|
| -//
|
| -// This means that operations using a given key cannot occur in
|
| -// parallel and it is not necessary to guard against concurrent usage.
|
| -//
|
| -// The exceptions are:
|
| -//
|
| -// * Key::ThreadSafeSerializeForClone(), which is called from the
|
| -// target Blink thread during structured clone.
|
| -//
|
| -// * ImportKeyRaw(), ImportKeySpki(), ImportKeyPkcs8(), which can be
|
| -// called from the target Blink thread during structured clone
|
| -// deserialization, as well as from the webcrypto worker pool.
|
| -//
|
| -// TODO(eroman): Change it so import happens in worker pool too.
|
| -// http://crbug.com/366834
|
| -namespace platform {
|
| -
|
| -class SymKey;
|
| -class PublicKey;
|
| -class PrivateKey;
|
| -
|
| -// Base key class for all platform keys, used to safely cast between types.
|
| -class Key : public blink::WebCryptoKeyHandle {
|
| - public:
|
| - virtual SymKey* AsSymKey() = 0;
|
| - virtual PublicKey* AsPublicKey() = 0;
|
| - virtual PrivateKey* AsPrivateKey() = 0;
|
| -
|
| - virtual bool ThreadSafeSerializeForClone(
|
| - blink::WebVector<uint8>* key_data) = 0;
|
| -};
|
| -
|
| -// Do any one-time initialization. Note that this can be called MULTIPLE times
|
| -// (once per instantiation of WebCryptoImpl).
|
| -void Init();
|
| +class AlgorithmImplementation;
|
|
|
| -// Preconditions:
|
| -// * |key| is a non-null AES-CBC key.
|
| -// * |iv| is exactly 16 bytes long
|
| -Status EncryptDecryptAesCbc(EncryptOrDecrypt mode,
|
| - SymKey* key,
|
| - const CryptoData& data,
|
| - const CryptoData& iv,
|
| - std::vector<uint8>* buffer);
|
| +void PlatformInit();
|
|
|
| -// Preconditions:
|
| -// * |key| is a non-null AES-GCM key.
|
| -// * |tag_length_bits| is one of {32, 64, 96, 104, 112, 120, 128}
|
| -Status EncryptDecryptAesGcm(EncryptOrDecrypt mode,
|
| - SymKey* key,
|
| - const CryptoData& data,
|
| - const CryptoData& iv,
|
| - const CryptoData& additional_data,
|
| - unsigned int tag_length_bits,
|
| - std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null
|
| -// * |hash| is a digest algorithm
|
| -// * |label| MAY be empty (e.g. 0 bytes long).
|
| -Status EncryptRsaOaep(PublicKey* key,
|
| - const blink::WebCryptoAlgorithm& hash,
|
| - const CryptoData& label,
|
| - const CryptoData& data,
|
| - std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null
|
| -// * |hash| is a digest algorithm
|
| -// * |label| MAY be empty (e.g. 0 bytes long).
|
| -Status DecryptRsaOaep(PrivateKey* key,
|
| - const blink::WebCryptoAlgorithm& hash,
|
| - const CryptoData& label,
|
| - const CryptoData& data,
|
| - std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |key| is a non-null HMAC key.
|
| -// * |hash| is a digest algorithm.
|
| -Status SignHmac(SymKey* key,
|
| - const blink::WebCryptoAlgorithm& hash,
|
| - const CryptoData& data,
|
| - std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |algorithm| is a SHA function.
|
| -Status DigestSha(blink::WebCryptoAlgorithmId algorithm,
|
| - const CryptoData& data,
|
| - std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |algorithm| is a SHA function.
|
| -scoped_ptr<blink::WebCryptoDigestor> CreateDigestor(
|
| +scoped_ptr<blink::WebCryptoDigestor> CreatePlatformDigestor(
|
| blink::WebCryptoAlgorithmId algorithm);
|
|
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -// * |hash| is a digest algorithm.
|
| -Status SignRsaSsaPkcs1v1_5(PrivateKey* key,
|
| - const blink::WebCryptoAlgorithm& hash,
|
| - const CryptoData& data,
|
| - std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -// * |hash| is a digest algorithm.
|
| -Status VerifyRsaSsaPkcs1v1_5(PublicKey* key,
|
| - const blink::WebCryptoAlgorithm& hash,
|
| - const CryptoData& signature,
|
| - const CryptoData& data,
|
| - bool* signature_match);
|
| -
|
| -// |keylen_bytes| is the desired length of the key in bits.
|
| -//
|
| -// Preconditions:
|
| -// * algorithm.id() is for a symmetric key algorithm.
|
| -// * keylen_bytes is non-zero (TODO(eroman): revisit this).
|
| -// * For AES algorithms |keylen_bytes| is either 16, 24, or 32 bytes long.
|
| -// * usage_mask makes sense for the algorithm.
|
| -Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - unsigned keylen_bytes,
|
| - blink::WebCryptoKey* key);
|
| -
|
| -// Preconditions:
|
| -// * algorithm.id() is for an RSA algorithm.
|
| -// * public_exponent, modulus_length_bits and hash_or_null are the same as what
|
| -// is in algorithm. They are split out for convenience.
|
| -// * modulus_length_bits is not 0
|
| -// * public_exponent is not empty.
|
| -// * {public|private}_key_usage_mask make sense for the algorithm.
|
| -Status GenerateRsaKeyPair(const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask public_key_usage_mask,
|
| - blink::WebCryptoKeyUsageMask private_key_usage_mask,
|
| - unsigned int modulus_length_bits,
|
| - unsigned long public_exponent,
|
| - blink::WebCryptoKey* public_key,
|
| - blink::WebCryptoKey* private_key);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -// * |algorithm.id()| is for a symmetric key algorithm.
|
| -// * For AES algorithms |key_data| is either 16, 24, or 32 bytes long.
|
| -// * usage_mask makes sense for the algorithm.
|
| -// Note that this may be called from target Blink thread.
|
| -Status ImportKeyRaw(const blink::WebCryptoAlgorithm& algorithm,
|
| - const CryptoData& key_data,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key);
|
| -
|
| -// Preconditions:
|
| -// * algorithm.id() is for an RSA algorithm.
|
| -// * usage_mask makes sense for the algorithm.
|
| -Status ImportRsaPublicKey(const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - const CryptoData& modulus_data,
|
| - const CryptoData& exponent_data,
|
| - blink::WebCryptoKey* key);
|
| -
|
| -// Preconditions:
|
| -// * algorithm.id() is for an RSA algorithm.
|
| -// * modulus, public_exponent, and private_exponent will be non-empty. The
|
| -// others will either all be specified (non-empty), or all be unspecified
|
| -// (empty).
|
| -// * usage_mask makes sense for the algorithm.
|
| -Status ImportRsaPrivateKey(const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - const CryptoData& modulus,
|
| - const CryptoData& public_exponent,
|
| - const CryptoData& private_exponent,
|
| - const CryptoData& prime1,
|
| - const CryptoData& prime2,
|
| - const CryptoData& exponent1,
|
| - const CryptoData& exponent2,
|
| - const CryptoData& coefficient,
|
| - blink::WebCryptoKey* key);
|
| -
|
| -// Note that this may be called from target Blink thread.
|
| -// Preconditions:
|
| -// * usage_mask makes sense for the algorithm.
|
| -Status ImportKeySpki(const blink::WebCryptoAlgorithm& algorithm,
|
| - const CryptoData& key_data,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key);
|
| -
|
| -// Note that this may be called from target Blink thread.
|
| -// Preconditions:
|
| -// * usage_mask makes sense for the algorithm.
|
| -Status ImportKeyPkcs8(const blink::WebCryptoAlgorithm& algorithm,
|
| - const CryptoData& key_data,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -Status ExportKeyRaw(SymKey* key, std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -Status ExportKeySpki(PublicKey* key, std::vector<uint8>* buffer);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -Status ExportRsaPublicKey(PublicKey* key,
|
| - std::vector<uint8>* modulus,
|
| - std::vector<uint8>* public_exponent);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -Status ExportRsaPrivateKey(PrivateKey* key,
|
| - std::vector<uint8>* modulus,
|
| - std::vector<uint8>* public_exponent,
|
| - std::vector<uint8>* private_exponent,
|
| - std::vector<uint8>* prime1,
|
| - std::vector<uint8>* prime2,
|
| - std::vector<uint8>* exponent1,
|
| - std::vector<uint8>* exponent2,
|
| - std::vector<uint8>* coefficient);
|
| -
|
| -// Preconditions:
|
| -// * |key| is non-null.
|
| -Status ExportKeyPkcs8(PrivateKey* key,
|
| - const blink::WebCryptoKeyAlgorithm& key_algorithm,
|
| - std::vector<uint8>* buffer);
|
| -
|
| -// Performs AES-KW encryption/decryption on the input |data|.
|
| -// Preconditions:
|
| -// * |key| is non-null
|
| -// * |data| is multiple of 8 bytes. If encrypting it is at least 16 bytes, and
|
| -// if decrypting at least 24 bytes.
|
| -// * |buffer| is non-null.
|
| -Status EncryptDecryptAesKw(EncryptOrDecrypt mode,
|
| - SymKey* key,
|
| - const CryptoData& data,
|
| - std::vector<uint8>* buffer);
|
| +AlgorithmImplementation* CreatePlatformShaImplementation();
|
| +AlgorithmImplementation* CreatePlatformAesCbcImplementation();
|
| +AlgorithmImplementation* CreatePlatformAesGcmImplementation();
|
| +AlgorithmImplementation* CreatePlatformAesKwImplementation();
|
| +AlgorithmImplementation* CreatePlatformHmacImplementation();
|
| +AlgorithmImplementation* CreatePlatformRsaOaepImplementation();
|
| +AlgorithmImplementation* CreatePlatformRsaSsaImplementation();
|
|
|
| -} // namespace platform
|
| +bool PlatformSerializeKeyForClone(const blink::WebCryptoKey& key,
|
| + blink::WebVector<uint8>* key_data);
|
|
|
| } // namespace webcrypto
|
|
|
|
|
Chromium Code Reviews
