From 90b9dc94d3d0c4cb13cb5e6e400ed1012747e6ff Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Sun, 24 Jan 2016 16:22:32 -0500
Subject: fix warnings

---
 acme-certify.hs     | 8 ++++----
 src/Network/ACME.hs | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/acme-certify.hs b/acme-certify.hs
index 7849b65..d20c3e4 100644
--- a/acme-certify.hs
+++ b/acme-certify.hs
@@ -91,10 +91,10 @@ cmdopts = CmdOpts <$> strOption (long "key" <> metavar "FILE" <>
 
 genKey :: FilePath -> IO String
 genKey privKeyFile = withOpenSSL $ do
-    kp <- generateRSAKey' 4096 65537
-    pem <- writePKCS8PrivateKey kp Nothing
-    writeFile privKeyFile pem
-    return pem
+  kp <- generateRSAKey' 4096 65537
+  pem <- writePKCS8PrivateKey kp Nothing
+  writeFile privKeyFile pem
+  return pem
 
 genReq :: Keys -> [DomainName] -> IO CSR
 genReq _ [] = error "genReq called with zero domains"
diff --git a/src/Network/ACME.hs b/src/Network/ACME.hs
index d2216ac..5ae12f3 100644
--- a/src/Network/ACME.hs
+++ b/src/Network/ACME.hs
@@ -93,12 +93,12 @@ extractCR r = do
                       (filtered . has $ ix "type" . only "http-01")
 
       token = r ^?! httpChallenge . JSON.key "token" . _String . to encodeUtf8
-      crUri = r ^?! httpChallenge . JSON.key "uri" . _String . to T.unpack
+      nextU = r ^?! httpChallenge . JSON.key "uri" . _String . to T.unpack
 
       thumb = thumbprint (JWK (rsaE pub) "RSA" (rsaN pub))
       thumbtoken = toStrict (LB.fromChunks [token, ".", thumb])
 
-  return $ ChallengeRequest crUri token thumbtoken
+  return $ ChallengeRequest nextU token thumbtoken
 
 ncErrorReport :: (Show body, AsValue body, MonadIO m) => Response body -> m ()
 ncErrorReport r =
@@ -121,7 +121,7 @@ retrieveCert :: (MonadReader Env m, MonadState Nonce m, MonadIO m) => CSR -> m (
 retrieveCert input = sendPayload _newCert (csr $ coerce input)
 
 notifyChallenge :: (MonadReader Env m, MonadState Nonce m, MonadIO m) => String -> ByteString -> m (Response LC.ByteString)
-notifyChallenge crUri thumbtoken = sendPayload (const crUri) (challenge thumbtoken)
+notifyChallenge uri thumbtoken = sendPayload (const uri) (challenge thumbtoken)
 
 data Env = Env { getDir :: Directory, getKeys :: Keys, getSession :: WS.Session }
 
-- 
cgit v1.2.3