Remove unused imports, extensions, & definitions

2 files changed, 9 insertions, 39 deletions

diff --git a/acme.hs b/acme.hs
index 795b822..d187f86 100644
--- a/acme.hs
+++ b/acme.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
@@ -11,27 +10,25 @@
 
 module Main where
 
-import           Control.Lens               hiding ((.=), each)
+import           Control.Lens               hiding (each, (.=))
 import           Control.Monad
 import           Control.Monad.RWS.Strict
-import           Crypto.Number.Serialize    (i2osp)
-import           Data.Aeson                 (ToJSON (..), Value, encode, object,
-                                             (.=))
+import           Data.Aeson                 (Value)
 import           Data.Aeson.Lens            hiding (key)
 import qualified Data.Aeson.Lens            as JSON
 import           Data.ByteString            (ByteString)
 import qualified Data.ByteString            as B
-import qualified Data.ByteString.Base64.URL as Base64
 import qualified Data.ByteString.Char8      as BC
 import qualified Data.ByteString.Lazy       as LB
 import qualified Data.ByteString.Lazy.Char8 as LC
 import           Data.Coerce
-import           Data.Digest.Pure.SHA       (bytestringDigest, sha256)
+import           Data.List
 import           Data.Maybe
 import           Data.String                (fromString)
 import qualified Data.Text                  as T
 import           Data.Text.Encoding         (decodeUtf8, encodeUtf8)
 import           Data.Time.Clock.POSIX      (getPOSIXTime)
+import           Network.ACME
 import           Network.Wreq               (Response, checkStatus, defaults,
                                              responseBody, responseHeader,
                                              responseStatus, statusCode,
@@ -40,19 +37,14 @@ import qualified Network.Wreq               as W
 import qualified Network.Wreq.Session       as WS
 import           OpenSSL
 import           OpenSSL.EVP.Digest
-import           OpenSSL.EVP.PKey
-import           OpenSSL.EVP.Sign
 import           OpenSSL.PEM
 import           OpenSSL.RSA
 import           OpenSSL.X509.Request
 import           Options.Applicative        hiding (header)
 import qualified Options.Applicative        as Opt
+import           Pipes
 import           System.Directory
 
-import Network.ACME
-import Data.List
-import Pipes
-
 stagingDirectoryUrl, liveDirectoryUrl :: String
 liveDirectoryUrl = "https://acme-v01.api.letsencrypt.org/directory"
 stagingDirectoryUrl = "https://acme-staging.api.letsencrypt.org/directory"
@@ -129,14 +121,11 @@ genReq domainKeyFile domains@(domain:_) = withOpenSSL $ do
   setSubjectName req [("CN", domain)]
   setVersion req 0
   setPublicKey req pub
-  void $ addExtensions req [nidSubjectAltName %%% intercalate ", " (map ("DNS:" ++) domains)]
+  void $ addExtensions req [(nidSubjectAltName, intercalate ", " (map ("DNS:" ++) domains))]
   signX509Req req priv (Just dig)
   writeX509ReqDER req
   where
-    nidKeyUsage = 83
     nidSubjectAltName = 85
-    (%%%) = (,)
-    infixr 0 %%%
 
 readKeyFile :: FilePath -> IO (Maybe Keys)
 readKeyFile = readFile >=> readKeys
diff --git a/src/Network/ACME.hs b/src/Network/ACME.hs
index 2481163..ccd0a8c 100644
--- a/src/Network/ACME.hs
+++ b/src/Network/ACME.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
@@ -17,47 +15,30 @@ module Network.ACME (
     signPayload,
     ) where
 
-import           Control.Lens               hiding ((.=))
-import           Control.Monad
-import           Control.Monad.RWS.Strict
 import           Crypto.Number.Serialize    (i2osp)
-import           Data.Aeson                 (ToJSON (..), Value, encode, object,
-                                             (.=))
-import           Data.Aeson.Lens            hiding (key)
-import qualified Data.Aeson.Lens            as JSON
+import           Data.Aeson                 (ToJSON (..), encode, object, (.=))
 import           Data.ByteString            (ByteString)
 import qualified Data.ByteString            as B
 import qualified Data.ByteString.Base64.URL as Base64
 import qualified Data.ByteString.Char8      as BC
 import qualified Data.ByteString.Lazy       as LB
 import qualified Data.ByteString.Lazy.Char8 as LC
-import           Data.Coerce
 import           Data.Digest.Pure.SHA       (bytestringDigest, sha256)
 import           Data.Maybe
-import           Data.String                (fromString)
-import qualified Data.Text                  as T
-import           Data.Text.Encoding         (decodeUtf8, encodeUtf8)
-import           Data.Time.Clock.POSIX      (getPOSIXTime)
-import           Network.Wreq               (Response, checkStatus, defaults,
-                                             responseBody, responseHeader,
-                                             responseStatus, statusCode,
-                                             statusMessage)
-import qualified Network.Wreq               as W
-import qualified Network.Wreq.Session       as WS
+import           Data.Text.Encoding         (decodeUtf8)
 import           OpenSSL
 import           OpenSSL.EVP.Digest
 import           OpenSSL.EVP.PKey
 import           OpenSSL.EVP.Sign
 import           OpenSSL.PEM
 import           OpenSSL.RSA
-import           OpenSSL.X509.Request
 
 data Keys = Keys RSAKeyPair RSAPubKey
 readKeys :: String -> IO (Maybe Keys)
 readKeys privKeyData = do
   keypair :: SomeKeyPair <- readPrivateKey privKeyData PwTTY
   let (priv :: Maybe RSAKeyPair) = toKeyPair keypair
-  pub :: Maybe RSAPubKey <- maybe (return Nothing) (fmap Just . rsaCopyPublic) priv
+  pub <- maybe (return Nothing) (fmap Just . rsaCopyPublic) priv
   return $ Keys <$> priv <*> pub
 
 --------------------------------------------------------------------------------