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

Unified Diff: public/platform/WebCryptoKeyAlgorithmParams.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/WebCryptoKeyAlgorithm.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/platform/WebCryptoKeyAlgorithmParams.h
diff --git a/public/platform/WebCryptoKeyAlgorithmParams.h b/public/platform/WebCryptoKeyAlgorithmParams.h
index e0e7974834db93c13a6c87fcfe4b86ce9ee29e4d..d71c6f086f399affab35891ac797ae1117cbb52a 100644
--- a/public/platform/WebCryptoKeyAlgorithmParams.h
+++ b/public/platform/WebCryptoKeyAlgorithmParams.h
@@ -41,7 +41,6 @@ enum WebCryptoKeyAlgorithmParamsType {
WebCryptoKeyAlgorithmParamsTypeNone,
WebCryptoKeyAlgorithmParamsTypeHmac,
WebCryptoKeyAlgorithmParamsTypeAes,
- WebCryptoKeyAlgorithmParamsTypeRsa,
WebCryptoKeyAlgorithmParamsTypeRsaHashed
};
@@ -103,11 +102,12 @@ private:
unsigned m_lengthBits;
};
-class WebCryptoRsaKeyAlgorithmParams : public WebCryptoKeyAlgorithmParams {
+class WebCryptoRsaHashedKeyAlgorithmParams : public WebCryptoKeyAlgorithmParams {
public:
- WebCryptoRsaKeyAlgorithmParams(unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize)
+ WebCryptoRsaHashedKeyAlgorithmParams(unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize, const WebCryptoAlgorithm& hash)
: m_modulusLengthBits(modulusLengthBits)
, m_publicExponent(publicExponent, publicExponentSize)
+ , m_hash(hash)
{
}
@@ -121,24 +121,6 @@ public:
return m_publicExponent;
}
- virtual WebCryptoKeyAlgorithmParamsType type() const
- {
- return WebCryptoKeyAlgorithmParamsTypeRsa;
- }
-
-private:
- unsigned m_modulusLengthBits;
- WebVector<unsigned char> m_publicExponent;
-};
-
-class WebCryptoRsaHashedKeyAlgorithmParams : public WebCryptoRsaKeyAlgorithmParams {
-public:
- WebCryptoRsaHashedKeyAlgorithmParams(unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize, const WebCryptoAlgorithm& hash)
- : WebCryptoRsaKeyAlgorithmParams(modulusLengthBits, publicExponent, publicExponentSize)
- , m_hash(hash)
- {
- }
-
const WebCryptoAlgorithm& hash() const
{
return m_hash;
@@ -150,6 +132,8 @@ public:
}
private:
+ unsigned m_modulusLengthBits;
+ WebVector<unsigned char> m_publicExponent;
WebCryptoAlgorithm m_hash;
};
« no previous file with comments | « public/platform/WebCryptoKeyAlgorithm.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698