Get rid of WTF::SHA1.

Source/platform/CryptoUtilities.h

 /*
- * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2014 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  * 3.  Neither the name of Google, Inc. ("Google") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY GOOGLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SecurityPolicy_h
-#define SecurityPolicy_h
+#ifndef CryptoUtilities_h
+#define CryptoUtilities_h
 
 #include "platform/PlatformExport.h"
-#include "platform/weborigin/ReferrerPolicy.h"
-#include "wtf/text/WTFString.h"
+#include "wtf/HashSet.h"
+#include "wtf/StringHasher.h"
+#include "wtf/Vector.h"
+#include "wtf/text/CString.h"
 
 namespace WebCore {
+namespace CryptoUtil {

[abarth-chromium, 2014/03/12 18:59:02]

I'd just drop this namespace entirely.  WebCore is one big happy namespace.  :)

[jww, 2014/04/01 23:29:09]

Done.

 
-class KURL;
-class SecurityOrigin;
+static const size_t kMaxDigestSize = 64;
+typedef Vector<uint8_t, kMaxDigestSize> DigestValue;

[eseidel, 2014/03/12 06:51:23]

I see, you're just typdefing to a vector directly, and I suspect that our base64
operations don't take uint_8_t and thus you ahve to reinterpet cast?

[jww, 2014/04/01 23:29:09]

Correct.

 
-class PLATFORM_EXPORT SecurityPolicy {
-public:
-    // True if the referrer should be omitted according to the
-    // ReferrerPolicyDefault. If you intend to send a referrer header, you
-    // should use generateReferrerHeader instead.
-    static bool shouldHideReferrer(const KURL&, const String& referrer);
-
-    // Returns the referrer modified according to the referrer policy for a
-    // navigation to a given URL. If the referrer returned is empty, the
-    // referrer header should be omitted.
-    static String generateReferrerHeader(ReferrerPolicy, const KURL&, const String& referrer);
-
-    static void addOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomain, bool allowDestinationSubdomains);
-    static void removeOriginAccessWhitelistEntry(const SecurityOrigin& sourceOrigin, const String& destinationProtocol, const String& destinationDomain, bool allowDestinationSubdomains);
-    static void resetOriginAccessWhitelists();
-
-    static bool isAccessWhiteListed(const SecurityOrigin* activeOrigin, const SecurityOrigin* targetOrigin);
-    static bool isAccessToURLWhiteListed(const SecurityOrigin* activeOrigin, const KURL&);
+const size_t sha1HashSize = 20;
+enum HashAlgorithm {
+    HashAlgorithmSha1,
+    HashAlgorithmSha256,
+    HashAlgorithmSha384,
+    HashAlgorithmSha512
 };
 
+PLATFORM_EXPORT void computeDigest(HashAlgorithm, const char* digestable, size_t length, DigestValue& digestResult);
+
+} // namespace CryptoUtil
 } // namespace WebCore
 
-#endif // SecurityPolicy_h
+namespace WTF {
+
+struct DigestValueHash {
+    static unsigned hash(const WebCore::CryptoUtil::DigestValue& v)
+    {
+        return StringHasher::computeHash(v.data(), v.size());
+    }
+    static bool equal(const WebCore::CryptoUtil::DigestValue& a, const WebCore::CryptoUtil::DigestValue& b)
+    {
+        return a == b;
+    };
+    static const bool safeToCompareToEmptyOrDeleted = true;
+};
+template <>
+struct DefaultHash<WebCore::CryptoUtil::DigestValue> {
+    typedef DigestValueHash Hash;
+};
+
+template <>
+struct DefaultHash<WebCore::CryptoUtil::HashAlgorithm> {
+    typedef IntHash<WebCore::CryptoUtil::HashAlgorithm> Hash;
+};
+template <>
+struct HashTraits<WebCore::CryptoUtil::HashAlgorithm> : UnsignedWithZeroKeyHashTraits<WebCore::CryptoUtil::HashAlgorithm> {
+};
+
+} // namespace WTF
+#endif // CryptoUtilities_h