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

Unified Diff: public/platform/WebCryptoAlgorithmParams.h

Issue 284973002: [webcrypto] Remove RSA-ES support (3 of 3) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Placate compiler warning on android about uninitialized variable Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « public/platform/WebCryptoAlgorithm.h ('k') | public/platform/WebCryptoKeyAlgorithm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/platform/WebCryptoAlgorithmParams.h
diff --git a/public/platform/WebCryptoAlgorithmParams.h b/public/platform/WebCryptoAlgorithmParams.h
index 5d94d350e55c728e8b5a820843ee1b84604d0c2f..1038c538f1382dd51092e96133cccea24bef1437 100644
--- a/public/platform/WebCryptoAlgorithmParams.h
+++ b/public/platform/WebCryptoAlgorithmParams.h
@@ -150,24 +150,6 @@ private:
const unsigned m_optionalLengthBits;
};
-class WebCryptoRsaKeyGenParams : public WebCryptoAlgorithmParams {
-public:
- WebCryptoRsaKeyGenParams(unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize)
- : m_modulusLengthBits(modulusLengthBits)
- , m_publicExponent(publicExponent, publicExponentSize)
- {
- }
-
- virtual WebCryptoAlgorithmParamsType type() const { return WebCryptoAlgorithmParamsTypeRsaKeyGenParams; }
-
- unsigned modulusLengthBits() const { return m_modulusLengthBits; }
- const WebVector<unsigned char>& publicExponent() const { return m_publicExponent; }
-
-private:
- const unsigned m_modulusLengthBits;
- const WebVector<unsigned char> m_publicExponent;
-};
-
class WebCryptoAesGcmParams : public WebCryptoAlgorithmParams {
public:
WebCryptoAesGcmParams(const unsigned char* iv, unsigned ivSize, bool hasAdditionalData, const unsigned char* additionalData, unsigned additionalDataSize, bool hasTagLengthBits, unsigned char tagLengthBits)
@@ -209,10 +191,11 @@ public:
virtual WebCryptoAlgorithmParamsType type() const { return WebCryptoAlgorithmParamsTypeRsaHashedImportParams; }
};
-class WebCryptoRsaHashedKeyGenParams : public WebCryptoRsaKeyGenParams {
+class WebCryptoRsaHashedKeyGenParams : public WebCryptoAlgorithmParams {
public:
explicit WebCryptoRsaHashedKeyGenParams(const WebCryptoAlgorithm& hash, unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize)
- : WebCryptoRsaKeyGenParams(modulusLengthBits, publicExponent, publicExponentSize)
+ : m_modulusLengthBits(modulusLengthBits)
+ , m_publicExponent(publicExponent, publicExponentSize)
, m_hash(hash)
{
BLINK_ASSERT(!hash.isNull());
@@ -220,9 +203,13 @@ public:
virtual WebCryptoAlgorithmParamsType type() const { return WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams; }
+ unsigned modulusLengthBits() const { return m_modulusLengthBits; }
+ const WebVector<unsigned char>& publicExponent() const { return m_publicExponent; }
const WebCryptoAlgorithm& hash() const { return m_hash; }
private:
+ const unsigned m_modulusLengthBits;
+ const WebVector<unsigned char> m_publicExponent;
const WebCryptoAlgorithm m_hash;
};
« no previous file with comments | « public/platform/WebCryptoAlgorithm.h ('k') | public/platform/WebCryptoKeyAlgorithm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698