SRI: Accept dashed hash algorithms.

Source/core/frame/SubresourceIntegrityTest.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/html/HTMLScriptElement.h"
@@ skipping 117 matching lines @@
 
     RefPtrWillBePersistent<Document> document;
     RefPtrWillBePersistent<HTMLScriptElement> scriptElement;
 };
 
 TEST_F(SubresourceIntegrityTest, ParseAlgorithm)
 {
     expectAlgorithm("sha256;", HashAlgorithmSha256);
     expectAlgorithm("sha384;", HashAlgorithmSha384);
     expectAlgorithm("sha512;", HashAlgorithmSha512);
+    expectAlgorithm("sha-256;", HashAlgorithmSha256);
+    expectAlgorithm("sha-384;", HashAlgorithmSha384);
+    expectAlgorithm("sha-512;", HashAlgorithmSha512);
 
     expectAlgorithmFailure("sha1;");
     expectAlgorithmFailure("sha-1;");
-    expectAlgorithmFailure("sha-256;");
-    expectAlgorithmFailure("sha-384;");
-    expectAlgorithmFailure("sha-512;");
 }
 
 TEST_F(SubresourceIntegrityTest, ParseDigest)
 {
     expectDigest("abcdefg", "abcdefg");
     expectDigest("abcdefg?", "abcdefg");
 
     expectDigestFailure("?");
     expectDigestFailure("&&&foobar&&&");
     expectDigestFailure("\x01\x02\x03\x04");
@@ skipping 12 matching lines @@
     expectParseFailure("ni:///not-sha256-at-all;abcdefg");
     expectParseFailure("ni:///sha256;&&&foobar&&&");
     expectParseFailure("ni:///sha256;\x01\x02\x03\x04");
 
     expectParse(
         "ni:///sha256;BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=",
         "BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=",
         HashAlgorithmSha256);
 
     expectParse(
+        "ni:///sha-256;BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=",
+        "BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=",
+        HashAlgorithmSha256);
+
+    expectParse(
         "     ni:///sha256;BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=     ",
         "BpfBw7ivV8q2jLiT13fxDYAe2tJllusRSZ273h2nFSE=",
         HashAlgorithmSha256);
 
     expectParse(
         "ni:///sha384;XVVXBGoYw6AJOh9J/Z8pBDMVVPfkBpngexkA7JqZu8d5GENND6TEIup/tA1v5GPr",
         "XVVXBGoYw6AJOh9J/Z8pBDMVVPfkBpngexkA7JqZu8d5GENND6TEIup/tA1v5GPr",
         HashAlgorithmSha384);
 
     expectParse(
+        "ni:///sha-384;XVVXBGoYw6AJOh9J/Z8pBDMVVPfkBpngexkA7JqZu8d5GENND6TEIup/tA1v5GPr",
+        "XVVXBGoYw6AJOh9J/Z8pBDMVVPfkBpngexkA7JqZu8d5GENND6TEIup/tA1v5GPr",
+        HashAlgorithmSha384);
+
+    expectParse(
         "ni:///sha512;tbUPioKbVBplr0b1ucnWB57SJWt4x9dOE0Vy2mzCXvH3FepqDZ+07yMK81ytlg0MPaIrPAjcHqba5csorDWtKg==",
         "tbUPioKbVBplr0b1ucnWB57SJWt4x9dOE0Vy2mzCXvH3FepqDZ+07yMK81ytlg0MPaIrPAjcHqba5csorDWtKg==",
         HashAlgorithmSha512);
+
+    expectParse(
+        "ni:///sha-512;tbUPioKbVBplr0b1ucnWB57SJWt4x9dOE0Vy2mzCXvH3FepqDZ+07yMK81ytlg0MPaIrPAjcHqba5csorDWtKg==",
+        "tbUPioKbVBplr0b1ucnWB57SJWt4x9dOE0Vy2mzCXvH3FepqDZ+07yMK81ytlg0MPaIrPAjcHqba5csorDWtKg==",
+        HashAlgorithmSha512);
 }
 
 //
 // End-to-end tests of ::CheckSubresourceIntegrity.
 //
 
 TEST_F(SubresourceIntegrityTest, CheckSubresourceIntegrityInSecureOrigin)
 {
     document->updateSecurityOrigin(secureOrigin->isolatedCopy());
 
@@ skipping 15 matching lines @@
     document->updateSecurityOrigin(insecureOrigin->isolatedCopy());
 
     expectIntegrityFailure(kSha256Integrity, kBasicScript, secureURL);
     expectIntegrityFailure(kSha384Integrity, kBasicScript, secureURL);
     expectIntegrityFailure(kSha512Integrity, kBasicScript, secureURL);
     expectIntegrityFailure(kSha384IntegrityLabeledAs256, kBasicScript, secureURL);
     expectIntegrityFailure(kUnsupportedHashFunctionIntegrity, kBasicScript, secureURL);
 }
 
 } // namespace blink