crypton-x509-util 1.9.1 → 1.9.2
raw patch · 3 files changed
+16/−6 lines, 3 files
Files
- ChangeLog.md +5/−0
- crypton-x509-util.cabal +2/−2
- src/Certificate.hs +9/−4
ChangeLog.md view
@@ -1,5 +1,10 @@ # ChangeLog for crypton-x509-util +## 1.9.2++* Fix trust store loading+ [#38](https://github.com/kazu-yamamoto/crypton-certificate/pull/38)+ ## 1.9.1 * Show ML-DSA keys, with the seed when the file held one
crypton-x509-util.cabal view
@@ -1,6 +1,6 @@ cabal-version: >=1.10 name: crypton-x509-util-version: 1.9.1+version: 1.9.2 license: BSD3 license-file: LICENSE copyright: Vincent Hanquez <vincent@snar.org>@@ -19,7 +19,7 @@ source-repository head type: git location: https://github.com/kazu-yamamoto/crypton-certificate- subdir: x509-util+ subdir: crypton-x509-util executable crypton-x509-util main-is: Certificate.hs
src/Certificate.hs view
@@ -17,6 +17,7 @@ import System.Console.GetOpt import System.Environment import System.Exit+import System.IO (hPutStrLn, stderr) import System.X509 -- for signing/verifying certificate@@ -343,7 +344,7 @@ putStrLn $ usageInfo "usage: x509-util cert [options] <certificates>" optionsCert exitSuccess- objs <- readSignedObject (head files)+ objs <- (firstFile files >>= readSignedObject) forM_ objs $ \o -> case o of Left err -> error ("decoding Certificate failed: " ++ show err)@@ -381,21 +382,21 @@ accHost a _ = a doCRLMain opts files = do- readSignedObject (head files) >>= \objs -> forM_ objs $ \o ->+ (firstFile files >>= readSignedObject) >>= \objs -> forM_ objs $ \o -> case o of Left err -> error ("decoding CRL failed: " ++ show err) Right signed -> do putStrLn $ show $ getCRL signed doASN1Main files = do- pem <- readPEMFile (head files)+ pem <- (firstFile files >>= readPEMFile) forM_ pem $ \p -> case decodeASN1' BER $ pemContent p of Left err -> error ("decoding ASN1 failed: " ++ show err) Right asn1 -> showASN1 0 asn1 doKeyMain files = do- pems <- readPEMFile (head files)+ pems <- (firstFile files >>= readPEMFile) forM_ pems $ \pem -> do let content = either (error . show) id $ decodeASN1' BER (pemContent pem) privkey = catMaybes $ pemToKey [] pem@@ -452,6 +453,10 @@ case getOpt Permute opts as of (o, n, []) -> f o n (_, _, err) -> error (show err)++firstFile :: [FilePath] -> IO FilePath+firstFile (f : _) = return f+firstFile [] = hPutStrLn stderr "x509-util: no file given" >> exitFailure usage = do putStrLn "usage: x509-util <cmd>"