diff options
author | joe <joe@jerkface.net> | 2014-05-11 19:54:19 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2014-05-11 19:54:19 -0400 |
commit | adec571e0f7e7474575303905f109d4348573a00 (patch) | |
tree | d1ea8f8a4745e60bd6a4cab358d7cf2280f8cf68 /PEM.hs | |
parent | 25c5eca6053af9c9c89d735ae795b603212fb1f0 (diff) |
show --cert, certificate import bug fixes
Diffstat (limited to 'PEM.hs')
-rw-r--r-- | PEM.hs | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,7 +1,6 @@ | |||
1 | {-# LANGUAGE OverloadedStrings #-} | 1 | {-# LANGUAGE OverloadedStrings #-} |
2 | module PEM where | 2 | module PEM where |
3 | 3 | ||
4 | import Data.Maybe | ||
5 | import Data.Monoid | 4 | import Data.Monoid |
6 | import qualified Data.ByteString.Lazy as LW | 5 | import qualified Data.ByteString.Lazy as LW |
7 | import qualified Data.ByteString.Lazy.Char8 as L | 6 | import 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 |