summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStephen Paul Weber <singpolyma@singpolyma.net>2013-01-01 13:08:12 -0500
committerStephen Paul Weber <singpolyma@singpolyma.net>2013-01-01 13:08:12 -0500
commit9e4f996c68c3901bab4a5e1e70638c2531a85994 (patch)
tree38b7e03b2208d56e3e19652335fda7d4f327b901 /Makefile
parent06f96ec8d862e43d12cfb4c3ad8650395cfc662c (diff)
Proper S2K type
S2K is a seperate concept and is used in both secret key packets and SymmetricallyEncryptedSessionKey packets. It should have its own parser and thus its own type. This also cleans up the SecretKeyPacket record considerably (the many Maybe fields were a smell). SecretKeyPacket.s2k should be set to (Just $ SimpleS2K MD5) in fallback cases. symmetric_algorithm should be set to Unencrypted when s2k_useage is 0. s2k_useage itself is only needed for the different between 255 and 254 (different checksum). Round trip encode/decode tests for S2K work.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 35b6523..4f03424 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ tests/suite: tests/suite.hs Data/OpenPGP.hs Data/OpenPGP/Internal.hs Data/OpenPG
23 ghc --make $(GHCFLAGS) -o $@ $^ 23 ghc --make $(GHCFLAGS) -o $@ $^
24 24
25Data/OpenPGP/Arbitrary.hs: Data/OpenPGP.hs Arbitrary.patch 25Data/OpenPGP/Arbitrary.hs: Data/OpenPGP.hs Arbitrary.patch
26 derive -d Arbitrary -m Data.OpenPGP.Arbitrary -iData.OpenPGP -iTest.QuickCheck -iTest.QuickCheck.Instances -iNumeric -iData.Char -iData.Word -o $@ Data/OpenPGP.hs 26 derive -d Arbitrary -m Data.OpenPGP.Arbitrary -iData.OpenPGP -iData.OpenPGP.Internal -iTest.QuickCheck -iTest.QuickCheck.Instances -iNumeric -iData.Char -iData.Word -o $@ Data/OpenPGP.hs
27 patch $@ Arbitrary.patch 27 patch $@ Arbitrary.patch
28 28
29report.html: tests/suite.hs Data/OpenPGP.hs Data/OpenPGP/Internal.hs 29report.html: tests/suite.hs Data/OpenPGP.hs Data/OpenPGP/Internal.hs