summaryrefslogtreecommitdiff
path: root/PEM.hs
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2014-05-11 19:54:19 -0400
committerjoe <joe@jerkface.net>2014-05-11 19:54:19 -0400
commitadec571e0f7e7474575303905f109d4348573a00 (patch)
treed1ea8f8a4745e60bd6a4cab358d7cf2280f8cf68 /PEM.hs
parent25c5eca6053af9c9c89d735ae795b603212fb1f0 (diff)
show --cert, certificate import bug fixes
Diffstat (limited to 'PEM.hs')
-rw-r--r--PEM.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/PEM.hs b/PEM.hs
index e6c8259..7b27e04 100644
--- a/PEM.hs
+++ b/PEM.hs
@@ -1,7 +1,6 @@
1{-# LANGUAGE OverloadedStrings #-} 1{-# LANGUAGE OverloadedStrings #-}
2module PEM where 2module PEM where
3 3
4import Data.Maybe
5import Data.Monoid 4import Data.Monoid
6import qualified Data.ByteString.Lazy as LW 5import qualified Data.ByteString.Lazy as LW
7import qualified Data.ByteString.Lazy.Char8 as L 6import qualified Data.ByteString.Lazy.Char8 as L
@@ -30,5 +29,5 @@ pemParser mtyp = ScanningParser (maybe fndany fndtyp mtyp) pbdy
30 (ys,rs) = span (/="-----END " <> typ <> "-----") xs 29 (ys,rs) = span (/="-----END " <> typ <> "-----") xs
31 mblob = PEMBlob typ <$> LW.pack <$> Base64.decode (L.unpack dta) 30 mblob = PEMBlob typ <$> LW.pack <$> Base64.decode (L.unpack dta)
32 dta = case ys of 31 dta = case ys of
33 _:dta_lines -> L.concat dta_lines 32 [] -> ""
34 [] -> "" 33 dta_lines -> L.concat dta_lines