summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--KeyRing.hs2
-rw-r--r--PEM.hs1
2 files changed, 3 insertions, 0 deletions
diff --git a/KeyRing.hs b/KeyRing.hs
index 14d4747..47afb9c 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -466,6 +466,8 @@ instance ASN1Object PKCS8_RSAPublicKey where
466 = \xs -> Start Sequence 466 = \xs -> Start Sequence
467 : Start Sequence 467 : Start Sequence
468 : OID [1,2,840,113549,1,1,1] 468 : OID [1,2,840,113549,1,1,1]
469 : Null -- Doesn't seem to be neccessary, but i'm adding it
470 -- to match PEM files I see in the wild.
469 : End Sequence 471 : End Sequence
470 : BitString (toBitArray bs 0) 472 : BitString (toBitArray bs 0)
471 : End Sequence 473 : End Sequence
diff --git a/PEM.hs b/PEM.hs
index f969484..e07b3d4 100644
--- a/PEM.hs
+++ b/PEM.hs
@@ -12,6 +12,7 @@ import ScanningParser
12data PEMBlob = PEMBlob { pemType :: L.ByteString 12data PEMBlob = PEMBlob { pemType :: L.ByteString
13 , pemBlob :: L.ByteString 13 , pemBlob :: L.ByteString
14 } 14 }
15 deriving (Eq,Show)
15 16
16pemParser mtyp = ScanningParser (maybe fndany fndtyp mtyp) pbdy 17pemParser mtyp = ScanningParser (maybe fndany fndtyp mtyp) pbdy
17 where 18 where