SRI: Accept dashed hash algorithms.

Source/core/frame/SubresourceIntegrity.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/frame/SubresourceIntegrity.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
@@ skipping 150 matching lines @@
 {
     // Any additions or subtractions from this struct should also modify the
     // respective entries in the kAlgorithmMap array in checkDigest() as well
     // as the array in algorithmToString().
     static const struct {
         const char* prefix;
         HashAlgorithm algorithm;
     } kSupportedPrefixes[] = {
         { "sha256", HashAlgorithmSha256 },
         { "sha384", HashAlgorithmSha384 },
-        { "sha512", HashAlgorithmSha512 }
+        { "sha512", HashAlgorithmSha512 },
+        { "sha-256", HashAlgorithmSha256 },

[jww, 2014/12/12 19:11:06]

If you're cool with it, I'd rather order the algorithms together (e.g. put the
SHA-256 prefixes together first). I think it would be easier to tell at a glance
what's going on.

+        { "sha-384", HashAlgorithmSha384 },
+        { "sha-512", HashAlgorithmSha512 }
     };
 
     for (auto& prefix : kSupportedPrefixes) {
         if (skipToken<UChar>(position, end, prefix.prefix)) {
             algorithm = prefix.algorithm;
             return true;
         }
     }
 
     return false;
@@ skipping 50 matching lines @@
         logErrorToConsole("Error parsing 'integrity' attribute ('" + attribute + "'). The digest must be a valid, base64-encoded value.", document);
         return false;
     }
 
     // FIXME: Parse params in order to get content type (e.g. "?ct=application/javascript")
 
     return true;
 }
 
 } // namespace blink