diff options
-rw-r--r-- | kiki.hs | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -23,7 +23,7 @@ import Control.Monad | |||
23 | import qualified Text.Show.Pretty as PP | 23 | import qualified Text.Show.Pretty as PP |
24 | import Text.PrettyPrint as PP hiding ((<>)) | 24 | import Text.PrettyPrint as PP hiding ((<>)) |
25 | import Data.List | 25 | import Data.List |
26 | import Data.OpenPGP.CryptoAPI | 26 | import Data.OpenPGP.CryptoAPI (verify,fingerprint,sign,decryptSecretKey) |
27 | import Data.Ord | 27 | import Data.Ord |
28 | import Data.Maybe | 28 | import Data.Maybe |
29 | import Data.Bits | 29 | import Data.Bits |
@@ -236,10 +236,13 @@ getPackets = do | |||
236 | Left (_,_,_) -> return [] | 236 | Left (_,_,_) -> return [] |
237 | 237 | ||
238 | 238 | ||
239 | instance Default S.ByteString where def = S.empty | ||
240 | |||
239 | secretToPublic pkt@(SecretKeyPacket {}) = | 241 | secretToPublic pkt@(SecretKeyPacket {}) = |
240 | PublicKeyPacket { version = version pkt | 242 | PublicKeyPacket { version = version pkt |
241 | , timestamp = timestamp pkt | 243 | , timestamp = timestamp pkt |
242 | , key_algorithm = key_algorithm pkt | 244 | , key_algorithm = key_algorithm pkt |
245 | , ecc_curve = def | ||
243 | , key = let seckey = key pkt | 246 | , key = let seckey = key pkt |
244 | pubs = public_key_fields (key_algorithm pkt) | 247 | pubs = public_key_fields (key_algorithm pkt) |
245 | in filter (\(k,v) -> k `elem` pubs) seckey | 248 | in filter (\(k,v) -> k `elem` pubs) seckey |
@@ -844,6 +847,7 @@ readKeyFromFile False "PEM" fname = do | |||
844 | { version = 4 | 847 | { version = 4 |
845 | , timestamp = toEnum (fromEnum timestamp) | 848 | , timestamp = toEnum (fromEnum timestamp) |
846 | , key_algorithm = RSA | 849 | , key_algorithm = RSA |
850 | , ecc_curve = def | ||
847 | , key = [ -- public fields... | 851 | , key = [ -- public fields... |
848 | ('n',rsaN rsa) | 852 | ('n',rsaN rsa) |
849 | ,('e',rsaE rsa) | 853 | ,('e',rsaE rsa) |