aging ifdefs moved to nursing home

2 files changed, 0 insertions, 41 deletions

diff --git a/kiki.hs b/kiki.hs
index fb4b878..eb997ac 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -30,22 +30,13 @@ import Foreign.C.Types (CTime(..))
 import System.Environment
 import System.Exit
 import System.IO (hPutStrLn,stderr)
-#if defined(VERSION_memory)
 import qualified Data.ByteString.Char8 as S8
 import Data.ByteArray.Encoding
-#elif defined(VERSION_dataenc)
-import qualified Codec.Binary.Base64 as Base64
-#endif
 import qualified Codec.Archive.Tar as Tar
 import qualified Codec.Archive.Tar.Entry as Tar
-#if !defined(VERSION_cryptonite)
-import qualified Crypto.Hash.RIPEMD160 as RIPEMD160
-import qualified Crypto.Hash.SHA256    as SHA256
-#else
 import Crypto.Hash.Algorithms (RIPEMD160(..))
 import Crypto.Hash
 import Data.ByteArray (convert)
-#endif
 import qualified Data.ByteString      as S
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Lazy.Char8 as Char8
@@ -281,11 +272,7 @@ dnsPresentationFromPacket k = do
     let RSAKey (MPI n) (MPI e)  = fromJust $ rsaKeyFromPacket k
         dnskey = DNS.RSA n e
         bin = runPut (DNS.putRSA dnskey)
-#if defined(VERSION_memory)
         qq  = S8.unpack $ convertToBase Base64 (L.toStrict bin)
-#elif defined(VERSION_dataenc)
-        qq  = Base64.encode (L.unpack bin)
-#endif
         ttl = 24*60*60 -- 24 hours in seconds
         flags = 256 -- (ZONE-key = bit7) TODO: is this a zone key or a key-signing key?
         algo = 8 -- RSASHA256 -- TODO: support other algorithm
@@ -323,11 +310,7 @@ show_torhash :: FilePath -> p -> IO ()
 show_torhash pubkey _ = do
     bs <- Char8.readFile pubkey
     let parsekey f dta  = do
-#if defined(VERSION_memory)
             let mdta = fmap L.fromStrict $ functorToMaybe $ convertFromBase Base64 (Char8.toStrict dta)
-#elif defined(VERSION_dataenc)
-            let mdta = L.pack <$> Base64.decode (Char8.unpack dta)
-#endif
             e <- decodeASN1 DER <$> mdta
             asn1 <- either (const Nothing) (Just) e
             k <- either (const Nothing) (Just . fst) (fromASN1 asn1)
@@ -358,11 +341,7 @@ show_cert keyspec wkgrip db = do
             -}
             let cs = mapMaybe x509cert $ (sigs >>= hashed_subpackets)
                 ds = map decodeBlob $ map (ParsedCert k (posixSecondsToUTCTime $ fromIntegral $ timestamp k)) cs
-#if defined(VERSION_memory)
                 qqs = map (S8.unpack . convertToBase Base64 . L.toStrict) ds
-#elif defined(VERSION_dataenc)
-                qqs = map (Base64.encode . L.unpack) ds
-#endif
                 pems = map (writePEM PemCertificate) qqs
             forM_ pems putStrLn
         _ -> void $ warn (keyspec ++ ": ambiguous")
diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 5481241..7cb373c 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -37,12 +37,8 @@ import           System.Posix.Files
 import           System.Posix.Types         (FileMode)
 import           System.Posix.IO            as Posix (createPipe)
 import           System.Posix.User
-#if defined(VERSION_memory)
 import           Data.ByteArray.Encoding
 import qualified Data.ByteString.Char8      as S8
-#elif defined(VERSION_dataenc)
-import qualified Codec.Binary.Base64        as Base64
-#endif
 import qualified Data.ByteString.Lazy       as L
 import qualified Data.ByteString.Lazy.Char8 as Char8
 import qualified Data.Map.Strict            as Map
@@ -74,18 +70,12 @@ cipherFromString s             =
         _                    -> error $ "known ciphers: "++unwords (map ciphername ciphers)
  {-
  where
-#if defined(VERSION_memory)
     unhex hx = case convertFromBase Base16 (S8.pack hx) of
                 Left e -> do
                     -- Useful for debugging but insecure generally ;)
                     -- putStrLn $ "convertFromBase error for input "++show hx++": "++show e
                     return Nothing
                 Right bs -> return $ Just $ S8.unpack bs
-#elif defined(VERSION_dataenc)
-    unhex hx = maybe (return () {- putStrLn $ "dataenc error for input "++show hx -})
-                     return
-                     $ fmap (map $ chr . fromIntegral) $ Base16.decode hx
-#endif
 -}
 
 
@@ -619,21 +609,11 @@ showA addr = if null bracket then pre else drop 1 pre
     where (pre,bracket) = break (==']') (show addr)
 
 
-#if !MIN_VERSION_base(4,8,0)
-sortOn :: Ord b => (a -> b) -> [a] -> [a]
-sortOn f =
-    map snd . sortBy (comparing fst) . map (\x -> let y = f x in y `seq` (y, x))
-#endif
-
 pemFromPacket :: Monad m => Packet -> m String
 pemFromPacket k = do
     let rsa = pkcs8 . fromJust $ rsaKeyFromPacket k
         der = encodeASN1 DER (toASN1 rsa [])
-#if defined(VERSION_memory)
         qq  = S8.unpack $ convertToBase Base64 (L.toStrict der)
-#elif defined(VERSION_dataenc)
-        qq  = Base64.encode (L.unpack der)
-#endif
     return $
         writePEM PemPublicKey qq -- ("TODO "++show keyspec)