1 files changed, 11 insertions, 6 deletions
diff --git a/src/libutil/hash.hh b/src/libutil/hash.hh
index a55295912..af11a028d 100644
--- a/src/libutil/hash.hh
+++ b/src/libutil/hash.hh
@@ -32,21 +32,26 @@ struct Hash
     HashType type;
 
     /* Create a zero-filled hash object. */
-    Hash(HashType type) : type(type) { init(); };
+    Hash(HashType type);
 
     /* Initialize the hash from a string representation, in the format
        "[<type>:]<base16|base32|base64>" or "<type>-<base64>" (a
        Subresource Integrity hash expression). If the 'type' argument
        is not present, then the hash type must be specified in the
        string. */
-    Hash(std::string_view s, std::optional<HashType> type);
-    // type must be provided
-    Hash(std::string_view s, HashType type);
+    static Hash parseAny(std::string_view s, std::optional<HashType> type);
     // hash type must be part of string
-    Hash(std::string_view s);
+    static Hash parseAnyPrefixed(std::string_view s);
+    // prefix parsed separately; non SRI hash
+    static Hash parseNonSRIUnprefixed(std::string_view s, HashType type);
 
-    void init();
+    static Hash parseSRI(std::string_view original);
 
+private:
+    // type must be provided, s must not include <type> prefix
+    Hash(std::string_view s, HashType type, bool isSRI);
+
+public:
     /* Check whether a hash is set. */
     operator bool () const { return (bool) type; }