Expose WebCrypto's lookupAlgorithmInfo.

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 57 matching lines @@
     {"SHA-512", 7, blink::WebCryptoAlgorithmIdSha512},
     {"SHA-384", 7, blink::WebCryptoAlgorithmIdSha384},
     {"SHA-256", 7, blink::WebCryptoAlgorithmIdSha256},
     {"AES-CBC", 7, blink::WebCryptoAlgorithmIdAesCbc},
     {"AES-GCM", 7, blink::WebCryptoAlgorithmIdAesGcm},
     {"AES-CTR", 7, blink::WebCryptoAlgorithmIdAesCtr},
     {"RSA-OAEP", 8, blink::WebCryptoAlgorithmIdRsaOaep},
     {"RSASSA-PKCS1-V1_5", 17, blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5},
 };
 
-typedef char ParamsTypeOrUndefined;
-const ParamsTypeOrUndefined Undefined = -1;
-
-struct AlgorithmInfo {
-    // The canonical (case-sensitive) name for the algorithm.
-    const char* name;
-
-    // A map from the operation to the expected parameter type of the algorithm.
-    // If an operation is not applicable for the algorithm, set to Undefined.
-    const ParamsTypeOrUndefined operationToParamsType[blink::WebCryptoOperationLast + 1];
-};
-
-// A mapping from the algorithm ID to information about the algorithm.
-const AlgorithmInfo algorithmIdToInfo[] = {
-    { // Index 0
-        "AES-CBC", {
-            blink::WebCryptoAlgorithmParamsTypeAesCbcParams, // Encrypt
-            blink::WebCryptoAlgorithmParamsTypeAesCbcParams, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            Undefined, // Digest
-            blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams, // GenerateKey
-            blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            blink::WebCryptoAlgorithmParamsTypeAesCbcParams, // WrapKey
-            blink::WebCryptoAlgorithmParamsTypeAesCbcParams // UnwrapKey
-        }
-    }, { // Index 1
-        "HMAC", {
-            Undefined, // Encrypt
-            Undefined, // Decrypt
-            blink::WebCryptoAlgorithmParamsTypeNone, // Sign
-            blink::WebCryptoAlgorithmParamsTypeNone, // Verify
-            Undefined, // Digest
-            blink::WebCryptoAlgorithmParamsTypeHmacKeyGenParams, // GenerateKey
-            blink::WebCryptoAlgorithmParamsTypeHmacImportParams, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            Undefined, // WrapKey
-            Undefined // UnwrapKey
-        }
-    }, { // Index 2
-        "RSASSA-PKCS1-v1_5", {
-            Undefined, // Encrypt
-            Undefined, // Decrypt
-            blink::WebCryptoAlgorithmParamsTypeNone, // Sign
-            blink::WebCryptoAlgorithmParamsTypeNone, // Verify
-            Undefined, // Digest
-            blink::WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams, // GenerateKey
-            blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            Undefined, // WrapKey
-            Undefined // UnwrapKey
-        }
-    }, { // Index 3
-        "SHA-1", {
-            Undefined, // Encrypt
-            Undefined, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            blink::WebCryptoAlgorithmParamsTypeNone, // Digest
-            Undefined, // GenerateKey
-            Undefined, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            Undefined, // WrapKey
-            Undefined // UnwrapKey
-        }
-    }, { // Index 4
-        "SHA-256", {
-            Undefined, // Encrypt
-            Undefined, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            blink::WebCryptoAlgorithmParamsTypeNone, // Digest
-            Undefined, // GenerateKey
-            Undefined, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            Undefined, // WrapKey
-            Undefined // UnwrapKey
-        }
-    }, { // Index 5
-        "SHA-384", {
-            Undefined, // Encrypt
-            Undefined, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            blink::WebCryptoAlgorithmParamsTypeNone, // Digest
-            Undefined, // GenerateKey
-            Undefined, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            Undefined, // WrapKey
-            Undefined // UnwrapKey
-        }
-    }, { // Index 6
-        "SHA-512", {
-            Undefined, // Encrypt
-            Undefined, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            blink::WebCryptoAlgorithmParamsTypeNone, // Digest
-            Undefined, // GenerateKey
-            Undefined, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            Undefined, // WrapKey
-            Undefined // UnwrapKey
-        }
-    }, { // Index 7
-        "AES-GCM", {
-            blink::WebCryptoAlgorithmParamsTypeAesGcmParams, // Encrypt
-            blink::WebCryptoAlgorithmParamsTypeAesGcmParams, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            Undefined, // Digest
-            blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams, // GenerateKey
-            blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            blink::WebCryptoAlgorithmParamsTypeAesGcmParams, // WrapKey
-            blink::WebCryptoAlgorithmParamsTypeAesGcmParams // UnwrapKey
-        }
-    }, { // Index 8
-        "RSA-OAEP", {
-            blink::WebCryptoAlgorithmParamsTypeRsaOaepParams, // Encrypt
-            blink::WebCryptoAlgorithmParamsTypeRsaOaepParams, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            Undefined, // Digest
-            blink::WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams, // GenerateKey
-            blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            blink::WebCryptoAlgorithmParamsTypeRsaOaepParams, // WrapKey
-            blink::WebCryptoAlgorithmParamsTypeRsaOaepParams // UnwrapKey
-        }
-    }, { // Index 9
-        "AES-CTR", {
-            blink::WebCryptoAlgorithmParamsTypeAesCtrParams, // Encrypt
-            blink::WebCryptoAlgorithmParamsTypeAesCtrParams, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            Undefined, // Digest
-            blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams, // GenerateKey
-            blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            blink::WebCryptoAlgorithmParamsTypeAesCtrParams, // WrapKey
-            blink::WebCryptoAlgorithmParamsTypeAesCtrParams // UnwrapKey
-        }
-    }, { // Index 10
-        "AES-KW", {
-            Undefined, // Encrypt
-            Undefined, // Decrypt
-            Undefined, // Sign
-            Undefined, // Verify
-            Undefined, // Digest
-            blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams, // GenerateKey
-            blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
-            Undefined, // DeriveKey
-            Undefined, // DeriveBits
-            blink::WebCryptoAlgorithmParamsTypeNone, // WrapKey
-            blink::WebCryptoAlgorithmParamsTypeNone // UnwrapKey
-        }
-    },
-};
-
-// Initializing the algorithmIdToInfo table above depends on knowing the enum
-// values for algorithm IDs. If those ever change, the table will need to be
-// updated.
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesCbc == 0, AesCbc_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdHmac == 1, Hmac_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 == 2, RsaSsaPkcs1v1_5_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha1 == 3, Sha1_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha256 == 4, Sha256_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha384 == 5, Sha384_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha512 == 6, Sha512_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesGcm == 7, AesGcm_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaOaep == 8, RsaOaep_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesCtr == 9, AesCtr_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesKw == 10, AesKw_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdLast == 10, Last_idDoesntMatch);
-COMPILE_ASSERT(10 == blink::WebCryptoOperationLast, UpdateParamsMapping);
-
 #if ASSERT_ENABLED
 
 // Essentially std::is_sorted() (however that function is new to C++11).
 template <typename Iterator>
 bool isSorted(Iterator begin, Iterator end)
 {
     if (begin == end)
         return true;
 
     Iterator prev = begin;
@@ skipping 89 matching lines @@
     if (it == end)
         return false;
 
     if (it->algorithmNameLength != algorithmName.length() || !equalIgnoringCase(algorithmName, it->algorithmName))
         return false;
 
     id = it->algorithmId;
     return true;
 }
 
-const AlgorithmInfo* lookupAlgorithmInfo(blink::WebCryptoAlgorithmId id)
-{
-    if (id < 0 || id >= WTF_ARRAY_LENGTH(algorithmIdToInfo))
-        return 0;
-    return &algorithmIdToInfo[id];
-}
-
 void setSyntaxError(const String& message, AlgorithmError* error)
 {
     error->errorType = blink::WebCryptoErrorTypeSyntax;
     error->errorDetails = message;
 }
 
 void setNotSupportedError(const String& message, AlgorithmError* error)
 {
     error->errorType = blink::WebCryptoErrorTypeNotSupported;
     error->errorDetails = message;
@@ skipping 497 matching lines @@
     if (!lookupAlgorithmIdByName(algorithmName, algorithmId)) {
         // FIXME: The spec says to return a SyntaxError if the input contains
         //        any non-ASCII characters.
         setNotSupportedError(context.toString("Unrecognized name"), error);
         return false;
     }
 
     // Remove the "Algorithm:" prefix for all subsequent errors.
     context.removeLast();
 
-    const AlgorithmInfo* algorithmInfo = lookupAlgorithmInfo(algorithmId);
+    const blink::WebCryptoAlgorithmInfo* algorithmInfo = blink::WebCryptoAlgorithm::lookupAlgorithmInfo(algorithmId);
 
-    if (algorithmInfo->operationToParamsType[op] == Undefined) {
-        context.add(algorithmIdToName(algorithmId));
+    if (algorithmInfo->operationToParamsType[op] == blink::WebCryptoAlgorithmInfo::Undefined) {
+        context.add(blink::WebCryptoAlgorithm::idToName(algorithmId));

[eroman, 2014/06/13 22:57:55]

This could be algorithmInfo->name instead

[pneubeck (no reviews), 2014/06/16 07:42:12]

Done.

         setNotSupportedError(context.toString("Unsupported operation", operationToString(op)), error);
         return false;
     }
 
     blink::WebCryptoAlgorithmParamsType paramsType = static_cast<blink::WebCryptoAlgorithmParamsType>(algorithmInfo->operationToParamsType[op]);
 
     OwnPtr<blink::WebCryptoAlgorithmParams> params;
     if (!parseAlgorithmParams(raw, paramsType, params, context, error))
         return false;
 
     algorithm = blink::WebCryptoAlgorithm(algorithmId, params.release());
     return true;
 }
 
 } // namespace
 
 bool normalizeAlgorithm(const Dictionary& raw, blink::WebCryptoOperation op, blink::WebCryptoAlgorithm& algorithm, AlgorithmError* error)
 {
     return parseAlgorithm(raw, op, algorithm, ErrorContext(), error);
 }
 
-const char* algorithmIdToName(blink::WebCryptoAlgorithmId id)
-{
-    return lookupAlgorithmInfo(id)->name;
-}
-
 } // namespace WebCore