keystore 0.7.0.0 → 0.7.0.1
raw patch · 4 files changed
+23/−19 lines, 4 filesPVP: minor bump suggested
API additions: PVP suggests at least a minor version bump
API changes (from Hackage documentation)
+ Data.KeyStore.Sections: mkSection :: Sections h s k => IC -> s -> IO ()
Files
- changelog +3/−0
- keystore.cabal +1/−1
- src/Data/KeyStore/Sections.hs +18/−17
- src/Data/KeyStore/Version.hs +1/−1
changelog view
@@ -110,3 +110,6 @@ * PM: add delete-all-plus-passwords * PM: add filter-plus-passwords * PM: add --exclude-plus-passwords switch to import++0.7.0.1 Chris Dornan <chrisd@irisconnect.co.uk> 2014-12-04+ * Data.KeyStore.Sections: export mkSection
keystore.cabal view
@@ -1,5 +1,5 @@ Name: keystore-Version: 0.7.0.0+Version: 0.7.0.1 Synopsis: Managing stores of secret things Homepage: http://github.com/cdornan/keystore Author: Chris Dornan
src/Data/KeyStore/Sections.hs view
@@ -32,6 +32,7 @@ , keyName , keyName_ , passwordName+ , mkSection ) where @@ -80,19 +81,19 @@ , s -> k, h -> k where hostDeploySection :: h -> s -- ^ the deployment section: for a given host,- -- the starting section for locating the keys- -- during a deployment ('higher'/closer sections- -- taking priority)+ -- the starting section for locating the keys+ -- during a deployment ('higher'/closer sections+ -- taking priority) sectionType :: s -> SectionType -- ^ whether the section holds the top key for the- -- keystore (i.e., keystore master key), the signing key- -- for the keystore or is a normal section containing- -- deployment keys+ -- keystore (i.e., keystore master key), the signing key+ -- for the keystore or is a normal section containing+ -- deployment keys superSections :: s -> [s] -- ^ the sections that get a copy of the master- -- for this section (making all of its keys- -- available to them); N.B., the graph formed by this- -- this relationship over the sections must be acyclic+ -- for this section (making all of its keys+ -- available to them); N.B., the graph formed by this+ -- this relationship over the sections must be acyclic keyIsHostIndexed :: k -> Maybe (h->Bool) -- ^ if the key is host-indexed then the predicate- -- specifies the hosts that use this key+ -- specifies the hosts that use this key keyIsInSection :: k -> s -> Bool -- ^ specifies which sections a key is resident in getKeyData :: Maybe h -> s -> k -> IO KeyData -- ^ loads the data for a particular key getKeyDataWithMode :: Maybe h -> s -> k -> IO (KeyDataMode,KeyData)@@ -101,7 +102,7 @@ describeKey :: k -> String -- ^ describes the key (for the ks help command) describeSection :: s -> String -- ^ describes the section (for the ks help command) sectionPWEnvVar :: s -> EnvVar -- ^ secifies the environment variable containing the- -- ^ master password/provate key for for the given section+ -- ^ master password/provate key for for the given section sectionType = const ST_keys @@ -183,7 +184,7 @@ scs = const sectionSettings mks :: Sections h s k => KeyPredicate h s k -> IC -> s -> IO ()- mks = const mk_section+ mks = const mkSection -- | Rotate in a set of keys specified by the predicate. rotate :: Sections h s k => IC -> KeyPredicate h s k -> IO ()@@ -405,16 +406,16 @@ s0 : concat [ s:lower_sections s | s<-[minBound..maxBound], s0 `elem` superSections s ] -mk_section :: Sections h s k => IC -> s -> IO ()-mk_section ic s = do- mk_section' ic s+mkSection :: Sections h s k => IC -> s -> IO ()+mkSection ic s = do+ mk_section ic s case sectionType s of ST_top -> return () ST_signing -> add_signing ic s ST_keys -> return () -mk_section' :: Sections h s k => IC -> s -> IO ()-mk_section' ic s =+mk_section :: Sections h s k => IC -> s -> IO ()+mk_section ic s = do add_password ic s add_save_key ic s add_trigger ic s
src/Data/KeyStore/Version.hs view
@@ -6,4 +6,4 @@ (a,b,c,d) = versionTuple versionTuple :: (Int,Int,Int,Int)-versionTuple = (0,7,0,0)+versionTuple = (0,7,0,1)