WebCrypto: Add interfaces for importKey().

Source/modules/crypto/NormalizeAlgorithm.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 170 matching lines @@
         return nullptr;
     case WebKit::WebCryptoAlgorithmParamsTypeAesCbcParams:
         return parseAesCbcParams(raw);
     case WebKit::WebCryptoAlgorithmParamsTypeAesKeyGenParams:
         return parseAesKeyGenParams(raw);
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
+const AlgorithmInfo* algorithmInfo(const Dictionary& raw, ExceptionCode& ec)
+{
+    String algorithmName;
+    if (!raw.get("name", algorithmName)) {
+        ec = NotSupportedError;
+        return 0;
+    }
+
+    if (!algorithmName.containsOnlyASCII()) {
+        ec = SyntaxError;
+        return 0;
+    }
+
+    const AlgorithmInfo* info = AlgorithmRegistry::lookupAlgorithmByName(algorithmName);
+    if (!info) {
+        ec = NotSupportedError;
+        return 0;
+    }
+
+    return info;
+}
+
 } // namespace
 
 // FIXME: Throw the correct exception types!
 // This implementation corresponds with:
 // http://www.w3.org/TR/WebCryptoAPI/#algorithm-normalizing-rules
 bool normalizeAlgorithm(const Dictionary& raw, AlgorithmOperation op, WebKit::WebCryptoAlgorithm& algorithm, ExceptionCode& ec)
 {
-    String algorithmName;
-    if (!raw.get("name", algorithmName)) {
-        ec = NotSupportedError;
+    const AlgorithmInfo* info = algorithmInfo(raw, ec);
+    if (!info)
         return false;
-    }
-
-    if (!algorithmName.containsOnlyASCII()) {
-        ec = SyntaxError;
-        return false;
-    }
-
-    const AlgorithmInfo* info = AlgorithmRegistry::lookupAlgorithmByName(algorithmName);
-    if (!info) {
-        ec = NotSupportedError;
-        return false;
-    }
 
     if (info->paramsForOperation[op] == UnsupportedOp) {
         ec = NotSupportedError;
         return false;
     }
 
     WebKit::WebCryptoAlgorithmParamsType paramsType = static_cast<WebKit::WebCryptoAlgorithmParamsType>(info->paramsForOperation[op]);
     OwnPtr<WebKit::WebCryptoAlgorithmParams> params = parseAlgorithmParams(raw, paramsType);
 
     if (!params && paramsType != WebKit::WebCryptoAlgorithmParamsTypeNone) {
         ec = NotSupportedError;
         return false;
     }
 
     algorithm = WebKit::WebCryptoAlgorithm(info->algorithmId, info->algorithmName, params.release());
     return true;
 }
 
+bool normalizeAlgorithmForImportKey(const Dictionary& raw, WebKit::WebCryptoAlgorithm& algorithm, ExceptionCode& ec)
+{
+    const AlgorithmInfo* info = algorithmInfo(raw, ec);
+    if (!info)
+        return false;
+
+    algorithm = WebKit::WebCryptoAlgorithm(info->algorithmId, info->algorithmName, nullptr);
+    return true;
+}
+
 } // namespace WebCore