Merge pull request #4 from luite/master

Fix certificate on OS X
haskell-tls · Mar 31, 2012 · 959f6d1 · 959f6d1
2 parents dc3d583 + 2980775
commit 959f6d1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/System/Certificate/X509/MacOS.hs b/System/Certificate/X509/MacOS.hs
@@ -11,10 +11,13 @@ import Control.Applicative
 import Data.Either
 import Data.Maybe
 
+keyChain :: String
+keyChain = "/System/Library/Keychains/SystemRootCertificates.keychain"
+
 findCertificate :: (X509 -> Bool) -> IO (Maybe X509)
 findCertificate f = do
-  (_, h, _, ph) <- runInteractiveCommand "security find-certificate -pa"
-  waitForProcess ph
-  pems <- parsePEMs <$> hGetContents h
+  (_, Just hout, _, ph) <- createProcess (proc "security" ["find-certificate", "-pa", keyChain]) { std_out = CreatePipe }
+  pems <- parsePEMs <$> hGetContents hout
+  _ <- waitForProcess ph
   let targets = rights $ map (decodeCertificate . LBS.fromChunks .  pure . snd) $ filter ((=="CERTIFICATE") . fst) pems
   return $ listToMaybe $ filter f targets