From 7c2ee942309df7a484f3ab50b1b090ca5e606c03 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Mon, 24 Jun 2019 21:18:22 -0400 Subject: move functions around between files. nothing should be different merge-note: I'm having trouble with the merge, so I'm leaving a lot of functions duplicated in lib/Keyring.hs that were originally moved-out to lib/KeyRing/BuildKeyDB.hs in this commit. I'll clean-up later. Hopefully. --- lib/KeyRing.hs | 122 ++++++++++++++------------------------------------------- 1 file changed, 30 insertions(+), 92 deletions(-) (limited to 'lib/KeyRing.hs') diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs index 1aed50e..244f880 100644 --- a/lib/KeyRing.hs +++ b/lib/KeyRing.hs @@ -24,98 +24,7 @@ {-# LANGUAGE PatternGuards #-} {-# LANGUAGE ForeignFunctionInterface #-} {-# LANGUAGE LambdaCase #-} -module KeyRing - ( - -- * Error Handling - KikiResult(..) - , KikiCondition(..) - , KikiReportAction(..) - , errorString - , reportString - -- * Manipulating Keyrings - , runKeyRing - , KeyRingOperation(..) - , PassphraseSpec(..) - , Transform(..) - -- , PacketUpdate(..) - -- , guardAuthentic - -- * Describing File Operations - , StreamInfo(..) - , Access(..) - , FileType(..) - , InputFile(..) - , Initializer(..) - , KeyFilter(..) - -- * Results of a KeyRing Operation - , KeyRingRuntime(..) - , OriginMapped(..) - , MappedPacket - , KeyDB - , KeyData(..) - , SubKey(..) - , keyflags - -- * Miscelaneous Utilities - , isKey - , isSecretKey - , derRSA - , derToBase32 - , backsig - , filterMatches - , flattenKeys - , flattenTop - , Hosts.Hosts - , isCryptoCoinKey - , matchpr - , parseSpec - , Spec - , parseUID - , UserIDRecord(..) - , pkcs8 - , RSAPublicKey(..) - , PKCS8_RSAPublicKey(..) - , rsaKeyFromPacket - , secretToPublic - , selectPublicKey - , selectSecretKey - , usage - , usageString - , walletImportFormat - , writePEM - , getBindings - , accBindings - , isSubkeySignature - , torhash - , torUIDFromKey - , ParsedCert(..) - , parseCertBlob - , packetFromPublicRSAKey - , decodeBlob - , selectPublicKeyAndSigs - , x509cert - , getHomeDir - , unconditionally - , SecretPEMData(..) - , readSecretPEMFile - , writeInputFileL - , InputFileContext(..) - , onionNameForContact - , keykey - , keyPacket - , KeySpec(..) - , MatchingField(..) - , SpecError(..) - , SingleKeySpec(..) - , parseSpec3 - , getHostnames - , secretPemFromPacket - , SubkeyStatus(..) - , getSubkeys - , writeKeyToFile - , resolveForReport - , KeyKey -- needed for Type sigs - , makeMemoizingDecrypter - , showPacket - ) where +module KeyRing (module KeyRing.Types, module KeyRing, module KeyRing.BuildKeyDB) import System.Environment import Control.Monad @@ -214,6 +123,35 @@ import FunctorToMaybe import DotLock import ProcessUtils (systemEnv, ExitCode(ExitFailure, ExitSuccess) ) import GnuPGAgent as Agent +import KeyRing.BuildKeyDB (accBindings, backsig, buildKeyDB, + combineTransforms, concatSort, + derRSA, derToBase32, filterMatches, + findTag, fingerdress, + flattenAllUids, flattenKeys, + flattenSub, flattenTop, + generateInternals, getBindings, + getHostnames, getSubkeys, + importSecretKey, insertSubkey, + isKey, isSecretKey, + isSubkeySignature, isUserID, + keyFlags0, keyPacket, keyflags, + keykey, mappedPacket, matchSpec, + matchpr, merge, mergeKeyPacket, + mkUsage, origin, + packetFromPublicRSAKey, + parseCertBlob, parseSingleSpec, + parseSpec, parseUID, + performManipulations, + readInputFileL, readSecretPEMFile, + resolveForReport, resolveInputFile, + rsaKeyFromPacket, secp256k1_id, + secretToPublic, seek_key, + selectKey0, selectPublicKey, + showPacket, sortByHint, + subkeyMappedPacket, torhash, try, + usage, usageFromFilter, + usageString) + import Types import PacketTranscoder import Transforms -- cgit v1.2.3