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

trunk/public/platform/WebCryptoKeyAlgorithmParams.h

 /*
  * Copyright (C) 2014 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 23 matching lines @@
 #include "WebCommon.h"
 #include "WebCryptoAlgorithm.h"
 #include "WebVector.h"
 
 namespace blink {
 
 enum WebCryptoKeyAlgorithmParamsType {
     WebCryptoKeyAlgorithmParamsTypeNone,
     WebCryptoKeyAlgorithmParamsTypeHmac,
     WebCryptoKeyAlgorithmParamsTypeAes,
+    WebCryptoKeyAlgorithmParamsTypeRsa,
     WebCryptoKeyAlgorithmParamsTypeRsaHashed
 };
 
 class WebCryptoKeyAlgorithmParams {
 public:
     virtual ~WebCryptoKeyAlgorithmParams() { }
     virtual WebCryptoKeyAlgorithmParamsType type() const
     {
         return WebCryptoKeyAlgorithmParamsTypeNone;
     }
@@ skipping 41 matching lines @@
     virtual WebCryptoKeyAlgorithmParamsType type() const
     {
         return WebCryptoKeyAlgorithmParamsTypeHmac;
     }
 
 private:
     WebCryptoAlgorithm m_hash;
     unsigned m_lengthBits;
 };
 
-class WebCryptoRsaHashedKeyAlgorithmParams : public WebCryptoKeyAlgorithmParams {
+class WebCryptoRsaKeyAlgorithmParams : public WebCryptoKeyAlgorithmParams {
 public:
-    WebCryptoRsaHashedKeyAlgorithmParams(unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize, const WebCryptoAlgorithm& hash)
+    WebCryptoRsaKeyAlgorithmParams(unsigned modulusLengthBits, const unsigned char* publicExponent, unsigned publicExponentSize)
         : m_modulusLengthBits(modulusLengthBits)
         , m_publicExponent(publicExponent, publicExponentSize)
-        , m_hash(hash)
     {
     }
 
     unsigned modulusLengthBits() const
     {
         return m_modulusLengthBits;
     }
 
     const WebVector<unsigned char>& publicExponent() const
     {
         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;
     }
 
     virtual WebCryptoKeyAlgorithmParamsType type() const
     {
         return WebCryptoKeyAlgorithmParamsTypeRsaHashed;
     }
 
 private:
-    unsigned m_modulusLengthBits;
-    WebVector<unsigned char> m_publicExponent;
     WebCryptoAlgorithm m_hash;
 };
 
 } // namespace blink
 
 #endif