summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Barenhoff <alios@alios.org>2012-06-29 16:50:02 +0200
committerStephen Paul Weber <singpolyma@singpolyma.net>2012-12-29 12:04:40 -0500
commit60b8c7b116681349fa5bdbe3703094539e8c2eeb (patch)
treea4fa8598ac4ff63f2dde8de5d4e217f650c39d15
parent3bd37771256f6a8f98c2e112c10e3bba84d6de78 (diff)
implemented TrustPacket
Merged a18c579af7771763a64c84891ce7912b87bd3a75
-rw-r--r--Data/OpenPGP.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index 90c254f..98622a1 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -13,6 +13,7 @@ module Data.OpenPGP (
13 CompressedDataPacket, 13 CompressedDataPacket,
14 MarkerPacket, 14 MarkerPacket,
15 LiteralDataPacket, 15 LiteralDataPacket,
16 TrustPacket,
16 UserIDPacket, 17 UserIDPacket,
17 EncryptedDataPacket, 18 EncryptedDataPacket,
18 ModificationDetectionCodePacket, 19 ModificationDetectionCodePacket,
@@ -217,6 +218,7 @@ data Packet =
217 timestamp::Word32, 218 timestamp::Word32,
218 content::B.ByteString 219 content::B.ByteString
219 } | 220 } |
221 TrustPacket B.ByteString |
220 UserIDPacket String | 222 UserIDPacket String |
221 EncryptedDataPacket { 223 EncryptedDataPacket {
222 version::Word8, -- 0 for old-skool no-MDC (tag 9) 224 version::Word8, -- 0 for old-skool no-MDC (tag 9)
@@ -478,6 +480,7 @@ put_packet (LiteralDataPacket { format = format, filename = filename,
478 where 480 where
479 filename_l = (fromIntegral $ B.length lz_filename) :: Word8 481 filename_l = (fromIntegral $ B.length lz_filename) :: Word8
480 lz_filename = B.fromString filename 482 lz_filename = B.fromString filename
483put_packet (TrustPacket bytes) = (bytes, 12)
481put_packet (UserIDPacket txt) = (B.fromString txt, 13) 484put_packet (UserIDPacket txt) = (B.fromString txt, 13)
482put_packet (EncryptedDataPacket 0 encrypted_data) = (encrypted_data, 9) 485put_packet (EncryptedDataPacket 0 encrypted_data) = (encrypted_data, 9)
483put_packet (EncryptedDataPacket version encrypted_data) = 486put_packet (EncryptedDataPacket version encrypted_data) =
@@ -655,6 +658,8 @@ parse_packet 11 = do
655 timestamp = timestamp, 658 timestamp = timestamp,
656 content = content 659 content = content
657 } 660 }
661-- TrustPacket, http://tools.ietf.org/html/rfc4880#section-5.10
662parse_packet 12 = fmap TrustPacket getRemainingByteString
658-- UserIDPacket, http://tools.ietf.org/html/rfc4880#section-5.11 663-- UserIDPacket, http://tools.ietf.org/html/rfc4880#section-5.11
659parse_packet 13 = 664parse_packet 13 =
660 fmap (UserIDPacket . B.toString) getRemainingByteString 665 fmap (UserIDPacket . B.toString) getRemainingByteString