autoupdate: improve base64 hash detection

ScoopInstaller · Oct 1, 2018 · 310096e · 310096e
1 parent 805b06a
commit 310096e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/autoupdate.ps1 b/lib/autoupdate.ps1
@@ -58,7 +58,7 @@ function find_hash_in_textfile([String] $url, [String] $basename, [String] $rege
     # convert base64 encoded hash values
     if ($hash -match '^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{4})$') {
         $base64 = $matches[0]
-        if(!($hash -match "^([a-fA-F0-9]{40,128})$")) {
+        if(!($hash -match "^[a-fA-F0-9]+$") -and $hash.length -in @(32, 40, 64, 128)) {
             try {
                 $hash = ([System.Convert]::FromBase64String($base64) | ForEach-Object { $_.ToString('x2') }) -join ''
             } catch {