Bug 1003852: Digest::SHA 5.82 and newer always croak on wide characters, preventing...

r/a=glob

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 625fee96311dffb18337ce7b3113325c5297c62f..164ff40bf0e6e130ceceb0d7a774fe64ded75992 100644 (file)
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -628,13 +628,13 @@ sub bz_crypt {
         $algorithm = $1;
     }
 
+    # Wide characters cause crypt and Digest to die.
+    if (Bugzilla->params->{'utf8'}) {
+        utf8::encode($password) if utf8::is_utf8($password);
+    }
+
     my $crypted_password;
     if (!$algorithm) {
-        # Wide characters cause crypt to die
-        if (Bugzilla->params->{'utf8'}) {
-            utf8::encode($password) if utf8::is_utf8($password);
-        }
-    
         # Crypt the password.
         $crypted_password = crypt($password, $salt);