Revert 174726 "[webcrypto] Remove RSA-ES support (3 of 3)"

trunk/public/platform/WebCryptoAlgorithmParams.h

 /*
  * 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 132 matching lines @@
 
     bool hasLengthBits() const { return m_hasLengthBits; }
 
     unsigned optionalLengthBits() const { return m_optionalLengthBits; }
 
 private:
     const bool m_hasLengthBits;
     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)
         : m_iv(iv, ivSize)
         , m_hasAdditionalData(hasAdditionalData)
         , m_optionalAdditionalData(additionalData, additionalDataSize)
         , m_hasTagLengthBits(hasTagLengthBits)
         , m_optionalTagLengthBits(tagLengthBits)
     {
         BLINK_ASSERT(hasAdditionalData || !additionalDataSize);
@@ skipping 21 matching lines @@
 class WebCryptoRsaHashedImportParams : public WebCryptoAlgorithmParamsWithHash {
 public:
     explicit WebCryptoRsaHashedImportParams(const WebCryptoAlgorithm& hash)
         : WebCryptoAlgorithmParamsWithHash(hash)
     {
     }
 
     virtual WebCryptoAlgorithmParamsType type() const { return WebCryptoAlgorithmParamsTypeRsaHashedImportParams; }
 };
 
-class WebCryptoRsaHashedKeyGenParams : public WebCryptoAlgorithmParams {
+class WebCryptoRsaHashedKeyGenParams : public WebCryptoRsaKeyGenParams {
 public:
     explicit WebCryptoRsaHashedKeyGenParams(const WebCryptoAlgorithm& hash, unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize)
-        : m_modulusLengthBits(modulusLengthBits)
-        , m_publicExponent(publicExponent, publicExponentSize)
+        : WebCryptoRsaKeyGenParams(modulusLengthBits, publicExponent, publicExponentSize)
         , m_hash(hash)
     {
         BLINK_ASSERT(!hash.isNull());
     }
 
     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;
 };
 
 class WebCryptoRsaOaepParams : public WebCryptoAlgorithmParams {
 public:
     WebCryptoRsaOaepParams(bool hasLabel, const unsigned char* label, unsigned labelSize)
         : m_hasLabel(hasLabel)
         , m_optionalLabel(label, labelSize)
     {
         BLINK_ASSERT(hasLabel || !labelSize);
     }
 
     virtual WebCryptoAlgorithmParamsType type() const { return WebCryptoAlgorithmParamsTypeRsaOaepParams; }
 
     bool hasLabel() const { return m_hasLabel; }
     const WebVector<unsigned char>& optionalLabel() const { return m_optionalLabel; }
 
 private:
     const bool m_hasLabel;
     const WebVector<unsigned char> m_optionalLabel;
 };
 
 } // namespace blink
 
 #endif