move genReq into the library

2 files changed, 21 insertions, 19 deletions

diff --git a/acme-certify.hs b/acme-certify.hs
index cda3d09..360579b 100644
--- a/acme-certify.hs
+++ b/acme-certify.hs
@@ -13,14 +13,12 @@ module Main where
 
 import           BasePrelude
 import qualified Data.ByteString.Lazy.Char8 as LC
-import           Network.ACME               (CSR (..), canProvision, certify, fileProvisioner, ensureWritableDir, (</>), domainToString)
-import           Network.ACME.Encoding      (Keys (..), readKeys, toStrict)
+import           Network.ACME               (canProvision, certify, fileProvisioner, ensureWritableDir, (</>), genReq)
+import           Network.ACME.Encoding      (Keys (..), readKeys)
 import           Network.URI
 import           OpenSSL
-import           OpenSSL.EVP.Digest
 import           OpenSSL.PEM
 import           OpenSSL.RSA
-import           OpenSSL.X509.Request
 import           Options.Applicative        hiding (header)
 import qualified Options.Applicative        as Opt
 import           System.Directory
@@ -95,20 +93,6 @@ genKey privKeyFile = withOpenSSL $ do
   writeFile privKeyFile pem
   return pem
 
-genReq :: Keys -> [DomainName] -> IO CSR
-genReq _ [] = error "genReq called with zero domains"
-genReq (Keys priv pub) domains@(domain:_) = withOpenSSL $ do
-  Just dig <- getDigestByName "SHA256"
-  req <- newX509Req
-  setSubjectName req [("CN", domainToString domain)]
-  setVersion req 0
-  setPublicKey req pub
-  void $ addExtensions req [(nidSubjectAltName, intercalate ", " (map (("DNS:" ++) . domainToString) domains))]
-  signX509Req req priv (Just dig)
-  CSR domains . toStrict <$> writeX509ReqDER req
-  where
-    nidSubjectAltName = 85
-
 getOrCreateKeys :: FilePath -> IO (Maybe Keys)
 getOrCreateKeys file = do
   exists <- doesFileExist file
diff --git a/src/Network/ACME.hs b/src/Network/ACME.hs
index 5a66028..f6bffe2 100644
--- a/src/Network/ACME.hs
+++ b/src/Network/ACME.hs
@@ -31,14 +31,32 @@ import           Network.Wreq               (Response, checkStatus, defaults,
                                              statusMessage)
 import qualified Network.Wreq               as W
 import qualified Network.Wreq.Session       as WS
-import           OpenSSL.RSA
 import           System.Directory
 import           Text.Email.Validate
 import           Text.Domain.Validate hiding (validate)
 import           Network.URI
+import           OpenSSL
+import           OpenSSL.EVP.Digest
+import           OpenSSL.RSA
+import           OpenSSL.X509.Request
+import Data.List
 
 type HttpProvisioner = URI -> ByteString -> IO ()
 
+genReq :: Keys -> [DomainName] -> IO CSR
+genReq _ [] = error "genReq called with zero domains"
+genReq (Keys priv pub) domains@(domain:_) = withOpenSSL $ do
+  Just dig <- getDigestByName "SHA256"
+  req <- newX509Req
+  setSubjectName req [("CN", domainToString domain)]
+  setVersion req 0
+  setPublicKey req pub
+  void $ addExtensions req [(nidSubjectAltName, intercalate ", " (map (("DNS:" ++) . domainToString) domains))]
+  signX509Req req priv (Just dig)
+  CSR domains . toStrict <$> writeX509ReqDER req
+  where
+    nidSubjectAltName = 85
+
 fileProvisioner :: WritableDir -> HttpProvisioner
 fileProvisioner challengeDir = BC.writeFile . uToF
   where