diff options
author | Joe Crayne <joe@jerkface.net> | 2019-07-15 18:45:45 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2019-07-15 18:45:45 -0400 |
commit | c54b35e665f2a8ec2fff484de99fd59b0454dcff (patch) | |
tree | 3d044266ba6e75098e2cb4fe061bf0bb8d666cac /lib/KeyRing.hs | |
parent | da8e9689ce6df97b0bde086f14e40a4e096d2a8f (diff) |
Switched fingerprint to wrapped ByteString + some module shuffling.
Diffstat (limited to 'lib/KeyRing.hs')
-rw-r--r-- | lib/KeyRing.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs index 70edb9e..3da3565 100644 --- a/lib/KeyRing.hs +++ b/lib/KeyRing.hs | |||
@@ -883,7 +883,7 @@ writeKeyToFile stream@(StreamInfo { typ = PEMFile }) fname packet = do | |||
883 | writeStamped (InputFileContext "" "") fname stamp output | 883 | writeStamped (InputFileContext "" "") fname stamp output |
884 | setFileCreationMask saved_mask | 884 | setFileCreationMask saved_mask |
885 | return [(fname, ExportedSubkey)] | 885 | return [(fname, ExportedSubkey)] |
886 | Nothing -> return [(fname, UnableToExport (key_algorithm packet) $ fingerprint packet)] | 886 | Nothing -> return [(fname, UnableToExport (key_algorithm packet) $ show $ fingerprint packet)] |
887 | 887 | ||
888 | writeKeyToFile StreamInfo { typ = DNSPresentation } fname packet = do | 888 | writeKeyToFile StreamInfo { typ = DNSPresentation } fname packet = do |
889 | case key_algorithm packet of | 889 | case key_algorithm packet of |
@@ -922,7 +922,7 @@ writeKeyToFile StreamInfo { typ = DNSPresentation } fname packet = do | |||
922 | writeStamped (InputFileContext "" "") fname stamp output | 922 | writeStamped (InputFileContext "" "") fname stamp output |
923 | setFileCreationMask saved_mask | 923 | setFileCreationMask saved_mask |
924 | return [(fname, ExportedSubkey)] | 924 | return [(fname, ExportedSubkey)] |
925 | algo -> return [(fname, UnableToExport algo $ fingerprint packet)] | 925 | algo -> return [(fname, UnableToExport algo $ show $ fingerprint packet)] |
926 | 926 | ||
927 | writePEMKeys :: (PacketDecrypter) | 927 | writePEMKeys :: (PacketDecrypter) |
928 | -> KeyDB | 928 | -> KeyDB |