Implemented kTransforms

1 files changed, 0 insertions, 93 deletions

diff --git a/kiki.hs b/kiki.hs
index ff21529..b5f5191 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -126,99 +126,6 @@ decode_sshrsa bs = do
 isCertificationSig (CertificationSignature {}) = True
 isCertificationSig _                           = True
 
-isSubkeySignature (SubkeySignature {}) = True
-isSubkeySignature _                    = False
-
-verifyBindings keys nonkeys = (top ++ filter isSubkeySignature embedded,othersigs)
- where
-    verified = do
-        sig <- signatures (Message nonkeys)
-        let v = verify (Message keys) sig
-        guard (not . null $ signatures_over v)
-        return v
-    (top,othersigs) = partition isSubkeySignature verified
-    embedded = do
-        sub <- top
-        let sigover = signatures_over sub
-            unhashed = sigover >>= unhashed_subpackets
-            subsigs = mapMaybe backsig unhashed
-            -- This should consist only of 0x19 values
-            -- subtypes = map signature_type subsigs
-        -- trace ("subtypes = "++show subtypes) (return ())
-        -- trace ("issuers: "++show (map signature_issuer subsigs)) (return ())
-        sig <- signatures (Message ([topkey sub,subkey sub]++subsigs))
-        let v = verify (Message [subkey sub]) sig
-        guard (not . null $ signatures_over v)
-        return v
-
-smallpr k = drop 24 $ fingerprint k
-
-
-disjoint_fp ks = {- concatMap group2 $ -} transpose grouped
- where
-    grouped    = groupBy samepr . sortBy (comparing smallpr) $ ks
-    samepr a b = smallpr a == smallpr b
-
-    {-
-    -- useful for testing
-    group2 :: [a] -> [[a]]
-    group2 (x:y:ys) = [x,y]:group2 ys
-    group2 [x]      = [[x]]
-    group2 []       = []
-    -}
-
-
-getBindings ::
-  [Packet]
-  ->
-    ( [([Packet],[SignatureOver])] -- ^ other signatures with key sets
-                                   --   that were used for the verifications
-    , [(Word8,
-       (Packet, Packet), -- (topkey,subkey)
-       [String],         -- usage flags
-       [SignatureSubpacket], -- hashed data
-       [Packet])] -- ^ binding signatures
-    )
-getBindings pkts = (sigs,bindings)
- where
-    (sigs,concat->bindings) = unzip $ do
-        let (keys,_) = partition isKey pkts
-        keys <- disjoint_fp keys
-        let (bs,sigs) = verifyBindings keys pkts
-        return . ((keys,sigs),) $ do
-            b <- bs -- trace ("sigs = "++show (map (map signature_issuer . signatures_over) sigs)) bs
-            i <- map signature_issuer (signatures_over b)
-            i <- maybeToList i
-            who <- maybeToList $ find_key fingerprint (Message keys) i
-            let (code,claimants) =
-                    case () of
-                        _ | who == topkey b -> (1,[])
-                        _ | who == subkey b -> (2,[])
-                        _                   -> (0,[who])
-            let hashed = signatures_over b >>= hashed_subpackets
-                kind = guard (code==1) >> hashed >>= maybeToList . usage
-            return (code,(topkey b,subkey b), kind, hashed,claimants)
-
--- Returned data is simmilar to getBindings but the Word8 codes
--- are ORed together.
-accBindings ::
-  Bits t =>
-  [(t, (Packet, Packet), [a], [a1], [a2])]
-  -> [(t, (Packet, Packet), [a], [a1], [a2])]
-accBindings bs = as
-  where
-    gs = groupBy samePair . sortBy (comparing bindingPair) $ bs
-    as = map (foldl1 combine) gs
-    bindingPair (_,p,_,_,_) = pub2 p
-      where
-        pub2 (a,b) = (pub a, pub b)
-        pub a = fingerprint_material a
-    samePair a b = bindingPair a == bindingPair b
-    combine (ac,p,akind,ahashed,aclaimaints)
-            (bc,_,bkind,bhashed,bclaimaints)
-        = (ac .|. bc,p,akind++bkind,ahashed++bhashed,aclaimaints++bclaimaints)
-
-
 fpmatch grip key =
     (==) Nothing
          (fmap (backend (fingerprint key)) grip >>= guard . not)