[webcrypto] Add the KeyAlgorithm interface.

Source/modules/crypto/Key.cpp

 /*
  * 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/crypto/Key.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
-#include "modules/crypto/Algorithm.h"
+#include "modules/crypto/KeyAlgorithm.h"
 #include "platform/CryptoResult.h"
 #include "public/platform/WebCryptoAlgorithmParams.h"
 #include "public/platform/WebString.h"
 
 namespace WebCore {
 
 namespace {
 
 const char* keyTypeToString(blink::WebCryptoKeyType type)
 {
@@ skipping 66 matching lines @@
     case Digest:
     case GenerateKey:
     case ImportKey:
         break;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-bool getHmacHashId(const blink::WebCryptoAlgorithm& algorithm, blink::WebCryptoAlgorithmId& hashId)
-{
-    if (algorithm.hmacParams()) {
-        hashId = algorithm.hmacParams()->hash().id();
-        return true;
-    }
-    if (algorithm.hmacKeyParams()) {
-        hashId = algorithm.hmacKeyParams()->hash().id();
-        return true;
-    }
-    return false;
-}
-
 } // namespace
 
 Key::~Key()
 {
 }
 
 Key::Key(const blink::WebCryptoKey& key)
     : m_key(key)
 {
     ScriptWrappable::init(this);
 }
 
 String Key::type() const
 {
     return keyTypeToString(m_key.type());
 }
 
 bool Key::extractable() const
 {
     return m_key.extractable();
 }
 
-Algorithm* Key::algorithm()
+KeyAlgorithm* Key::algorithm()
 {
     if (!m_algorithm)
-        m_algorithm = Algorithm::create(m_key.algorithm());
+        m_algorithm = KeyAlgorithm::create(m_key.algorithm());
     return m_algorithm.get();
 }
 
 // FIXME: This creates a new javascript array each time. What should happen
 //        instead is return the same (immutable) array. (Javascript callers can
 //        distinguish this by doing an == test on the arrays and seeing they are
 //        different).
 Vector<String> Key::usages() const
 {
     Vector<String> result;
@@ skipping 10 matching lines @@
     if (!(m_key.usages() & toKeyUsage(op))) {
         result->completeWithError("key.usages does not permit this operation");
         return false;
     }
 
     if (m_key.algorithm().id() != algorithm.id()) {
         result->completeWithError("key.algorithm does not match that of operation");
         return false;
     }
 
-    // Verify that the algorithm-specific parameters for the key conform to the
-    // algorithm.
-    // FIXME: This is incomplete and not future proof. Operational parameters
-    //        should be enumerated when defining new parameters.
-
-    if (m_key.algorithm().id() == blink::WebCryptoAlgorithmIdHmac) {
-        blink::WebCryptoAlgorithmId keyHash;
-        blink::WebCryptoAlgorithmId algorithmHash;
-        if (!getHmacHashId(m_key.algorithm(), keyHash) || !getHmacHashId(algorithm, algorithmHash) || keyHash != algorithmHash) {
-            result->completeWithError("key.algorithm does not match that of operation (HMAC's hash differs)");
-            return false;
-        }
-    }
-
     return true;
 }
 
 bool Key::parseFormat(const String& formatString, blink::WebCryptoKeyFormat& format, CryptoResult* result)
 {
     // There are few enough values that testing serially is fast enough.
     if (formatString == "raw") {
         format = blink::WebCryptoKeyFormatRaw;
         return true;
     }
@@ skipping 27 matching lines @@
     }
     return true;
 }
 
 void Key::trace(Visitor* visitor)
 {
     visitor->trace(m_algorithm);
 }
 
 } // namespace WebCore