diff options
Diffstat (limited to 'lib/KeyRing.hs')
-rw-r--r-- | lib/KeyRing.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs index 554c4ad..5b51a93 100644 --- a/lib/KeyRing.hs +++ b/lib/KeyRing.hs | |||
@@ -87,7 +87,8 @@ import KeyRing.BuildKeyDB (allNames', Hostnames, | |||
87 | readSecretPEMFile, | 87 | readSecretPEMFile, |
88 | secp256k1_id, | 88 | secp256k1_id, |
89 | selectPublicKey, | 89 | selectPublicKey, |
90 | usageFromFilter) | 90 | usageFromFilter, |
91 | preferredPGPVersion) | ||
91 | 92 | ||
92 | import KeyRing.Types | 93 | import KeyRing.Types |
93 | import KeyDB | 94 | import KeyDB |
@@ -1025,7 +1026,7 @@ initializeMissingPEMFiles operation ctx grip mwk transcode db = do | |||
1025 | ExitFailure num -> return (tup,FailedExternal num) | 1026 | ExitFailure num -> return (tup,FailedExternal num) |
1026 | ExitSuccess -> return (tup,ExternallyGeneratedFile) | 1027 | ExitSuccess -> return (tup,ExternallyGeneratedFile) |
1027 | 1028 | ||
1028 | v <- foldM (importSecretKey transcode) | 1029 | v <- foldM (importSecretKey transcode (preferredPGPVersion operation)) |
1029 | (KikiSuccess (db,[])) $ do | 1030 | (KikiSuccess (db,[])) $ do |
1030 | ((f,subspec,ms,stream,cmd),r) <- rs | 1031 | ((f,subspec,ms,stream,cmd),r) <- rs |
1031 | guard $ case r of | 1032 | guard $ case r of |
@@ -1058,7 +1059,7 @@ initializeMissingPEMFiles operation ctx grip mwk transcode db = do | |||
1058 | internalInitializer _ = Nothing | 1059 | internalInitializer _ = Nothing |
1059 | 1060 | ||
1060 | mapM_ (hPutStrLn stderr) (lefts internals) | 1061 | mapM_ (hPutStrLn stderr) (lefts internals) |
1061 | v <- generateInternals transcode mwk db (rights internals) | 1062 | v <- generateInternals transcode (preferredPGPVersion operation) mwk db (rights internals) |
1062 | 1063 | ||
1063 | try v $ \(db,internals_rs) -> do | 1064 | try v $ \(db,internals_rs) -> do |
1064 | 1065 | ||