2 files changed, 6 insertions, 3 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 8864df4..e0c3b77 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1439,6 +1439,9 @@ spemPacket _ = Nothing
 spemCert (PEMCertificate p) = Just p
 spemCert _ = Nothing
 
+toStrict :: L.ByteString -> S.ByteString
+toStrict = foldr1 (<>) . L.toChunks
+
 parseCertBlob comp bs = do
     asn1 <- either (const Nothing) Just
                 $ decodeASN1 DER bs
@@ -1449,8 +1452,8 @@ parseCertBlob comp bs = do
     case X509.certPubKey cert of
         X509.PubKeyRSA key -> do
             let withoutkey =
-                    let ekey = Char8.toStrict $ encodeASN1 DER (toASN1 key [])
-                        (pre,post) = S.breakSubstring ekey $ Char8.toStrict bs
+                    let ekey = toStrict $ encodeASN1 DER (toASN1 key [])
+                        (pre,post) = S.breakSubstring ekey $ toStrict bs
                         post' = S.drop (S.length ekey) post
                         len :: Word16
                         len = if S.null post then maxBound
diff --git a/TimeUtil.hs b/TimeUtil.hs
index 77e85bf..1c241a4 100644
--- a/TimeUtil.hs
+++ b/TimeUtil.hs
@@ -85,7 +85,7 @@ dateParser = ScanningParser ffst pbdy
     ffst bs = do
         let (h,bs') = L.splitAt 6 bs
         if h=="Date: "
-          then return $ parseRFC2822 $ L.toStrict bs'
+          then return $ parseRFC2822 $ foldr1 S.append $ L.toChunks bs'
           else Nothing
     pbdy date xs = (date,xs)