| Index: public/platform/WebCryptoAlgorithm.h
|
| diff --git a/public/platform/WebCryptoAlgorithm.h b/public/platform/WebCryptoAlgorithm.h
|
| index a981a892ca65f885b7454d9f9d886ab707d3e14b..0509b891bcba96863e9c5a2d5232d0ffd8ab0e4d 100644
|
| --- a/public/platform/WebCryptoAlgorithm.h
|
| +++ b/public/platform/WebCryptoAlgorithm.h
|
| @@ -63,10 +63,11 @@ enum WebCryptoAlgorithmParamsType {
|
| WebCryptoAlgorithmParamsTypeNone,
|
| WebCryptoAlgorithmParamsTypeAesCbcParams,
|
| WebCryptoAlgorithmParamsTypeAesKeyGenParams,
|
| - WebCryptoAlgorithmParamsTypeHmacParams,
|
| - WebCryptoAlgorithmParamsTypeHmacKeyParams,
|
| - WebCryptoAlgorithmParamsTypeRsaSsaParams,
|
| + WebCryptoAlgorithmParamsTypeHmacImportParams,
|
| + WebCryptoAlgorithmParamsTypeHmacKeyGenParams,
|
| WebCryptoAlgorithmParamsTypeRsaKeyGenParams,
|
| + WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams,
|
| + WebCryptoAlgorithmParamsTypeRsaHashedImportParams,
|
| WebCryptoAlgorithmParamsTypeAesGcmParams,
|
| WebCryptoAlgorithmParamsTypeRsaOaepParams,
|
| WebCryptoAlgorithmParamsTypeAesCtrParams,
|
| @@ -74,13 +75,14 @@ enum WebCryptoAlgorithmParamsType {
|
|
|
| class WebCryptoAesCbcParams;
|
| class WebCryptoAesKeyGenParams;
|
| -class WebCryptoHmacParams;
|
| -class WebCryptoHmacKeyParams;
|
| -class WebCryptoRsaSsaParams;
|
| +class WebCryptoHmacImportParams;
|
| +class WebCryptoHmacKeyGenParams;
|
| class WebCryptoRsaKeyGenParams;
|
| class WebCryptoAesGcmParams;
|
| class WebCryptoRsaOaepParams;
|
| class WebCryptoAesCtrParams;
|
| +class WebCryptoRsaHashedKeyGenParams;
|
| +class WebCryptoRsaHashedImportParams;
|
|
|
| class WebCryptoAlgorithmParams;
|
| class WebCryptoAlgorithmPrivate;
|
| @@ -121,13 +123,14 @@ public:
|
| // type of parameters. Retrieving an invalid parameter will return 0.
|
| BLINK_PLATFORM_EXPORT const WebCryptoAesCbcParams* aesCbcParams() const;
|
| BLINK_PLATFORM_EXPORT const WebCryptoAesKeyGenParams* aesKeyGenParams() const;
|
| - BLINK_PLATFORM_EXPORT const WebCryptoHmacParams* hmacParams() const;
|
| - BLINK_PLATFORM_EXPORT const WebCryptoHmacKeyParams* hmacKeyParams() const;
|
| - BLINK_PLATFORM_EXPORT const WebCryptoRsaSsaParams* rsaSsaParams() const;
|
| + BLINK_PLATFORM_EXPORT const WebCryptoHmacImportParams* hmacImportParams() const;
|
| + BLINK_PLATFORM_EXPORT const WebCryptoHmacKeyGenParams* hmacKeyGenParams() const;
|
| BLINK_PLATFORM_EXPORT const WebCryptoRsaKeyGenParams* rsaKeyGenParams() const;
|
| BLINK_PLATFORM_EXPORT const WebCryptoAesGcmParams* aesGcmParams() const;
|
| BLINK_PLATFORM_EXPORT const WebCryptoRsaOaepParams* rsaOaepParams() const;
|
| BLINK_PLATFORM_EXPORT const WebCryptoAesCtrParams* aesCtrParams() const;
|
| + BLINK_PLATFORM_EXPORT const WebCryptoRsaHashedImportParams* rsaHashedImportParams() const;
|
| + BLINK_PLATFORM_EXPORT const WebCryptoRsaHashedKeyGenParams* rsaHashedKeyGenParams() const;
|
|
|
| private:
|
| BLINK_PLATFORM_EXPORT void assign(const WebCryptoAlgorithm& other);
|
|
|