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;
 }
 
-} // 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)
+bool getAlgorithmInfo(const Dictionary& raw, const AlgorithmInfo*& info, ExceptionCode& ec)

[abarth-chromium, 2013/07/23 06:22:07]

We generally try to avoid using "get" as a verb in function names.  It's a weak
verb that doesn't really mean anything.  In this case, it might make sense
because you're extracting this information from a dictionary, and the main
operation on a dictionary is "get"...  I guess its fine.

[eroman, 2013/07/23 23:29:02]

Done.

 {
     String algorithmName;
     if (!raw.get("name", algorithmName)) {
         ec = NotSupportedError;
         return false;
     }
 
     if (!algorithmName.containsOnlyASCII()) {
         ec = SyntaxError;
         return false;
     }
 
-    const AlgorithmInfo* info = AlgorithmRegistry::lookupAlgorithmByName(algorithmName);
+    info = AlgorithmRegistry::lookupAlgorithmByName(algorithmName);
     if (!info) {
         ec = NotSupportedError;
         return false;
     }
 
+    return true;
+}
+
+} // 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)
+{
+    const AlgorithmInfo* info;

[abarth-chromium, 2013/07/23 06:22:07]

Please initialize scalars.

[eroman, 2013/07/23 23:29:02]

Done.

+    if (!getAlgorithmInfo(raw, info, ec))
+        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;
+    if (!getAlgorithmInfo(raw, info, ec))
+        return false;
+
+    algorithm = WebKit::WebCryptoAlgorithm(info->algorithmId, info->algorithmName, nullptr);
+    return true;
+}
+
 } // namespace WebCore