summaryrefslogtreecommitdiff
path: root/Utility/Base64.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Utility/Base64.hs')
-rw-r--r--Utility/Base64.hs10
1 files changed, 8 insertions, 2 deletions
diff --git a/Utility/Base64.hs b/Utility/Base64.hs
index 0e3087276..8b43ecfab 100644
--- a/Utility/Base64.hs
+++ b/Utility/Base64.hs
@@ -10,11 +10,13 @@
module Utility.Base64 (toB64, fromB64Maybe, fromB64, prop_b64_roundtrips) where
+import Utility.FileSystemEncoding
+
import qualified "sandi" Codec.Binary.Base64 as B64
import Data.Maybe
import qualified Data.ByteString.Lazy as L
import Data.ByteString.UTF8 (fromString, toString)
-import Utility.FileSystemEncoding
+import Data.Char
toB64 :: String -> String
toB64 = toString . B64.encode . L.toStrict . encodeBS
@@ -28,5 +30,9 @@ fromB64 = fromMaybe bad . fromB64Maybe
where
bad = error "bad base64 encoded data"
+-- Only ascii strings are tested, because an arbitrary string may contain
+-- characters not encoded using the FileSystemEncoding.
prop_b64_roundtrips :: String -> Bool
-prop_b64_roundtrips s = s == fromB64 (toB64 s)
+prop_b64_roundtrips s
+ | all (isAscii) s = s == fromB64 (toB64 s)
+ | otherwise = True