x509-util 1.6.0 → 1.6.1

raw patch · 2 files changed

+35/−2 lines, 2 filesdep +hourglass

Dependencies added: hourglass

Files

• src/Certificate.hs +33/−1
• x509-util.cabal +2/−1

@@ -17,6 +17,7 @@ import System.X509 import Data.X509.CertificateStore import Data.X509.Validation+import Data.Hourglass  -- for signing/verifying certificate import Crypto.Hash@@ -32,6 +33,9 @@ import Text.Printf import Numeric +formatValidity (start,end) = p start ++ " to " ++ p end+  where p t = timePrint ("YYYY-MM-DD H:MI:S" :: String) t+ hexdump :: B.ByteString -> String hexdump bs = concatMap hex $ B.unpack bs     where hex n@@ -67,6 +71,22 @@         showKnownExtension n (Just (Left e)) = putStrLn ("  " ++ n ++ ": ERROR: " ++ show e)         showKnownExtension _ (Just (Right e)) = putStrLn ("  " ++ show e) +showCertSmall :: SignedCertificate -> IO ()+showCertSmall signedCert = do+    putStrLn "subject: "+    showDN $ X509.certSubjectDN cert+    putStrLn ("valid:  " ++ formatValidity (X509.certValidity cert))+    case X509.certPubKey cert of+        X509.PubKeyRSA pubkey     -> printf "public key: RSA (%d bits)\n" (RSA.public_size pubkey * 8)+        X509.PubKeyDSA pubkey     -> printf "public key: DSA\n"+        X509.PubKeyUnknown oid ws -> printf "public key: unknown: %s\n" (show oid)+        pk                        -> printf "public key: %s\n" (show pk)+  where+    signed  = X509.getSigned signedCert+    --sigalg  = X509.signedAlg signed+    --sigbits = X509.signedSignature signed+    cert    = X509.signedObject signed+ showCert :: SignedCertificate -> IO () showCert signedCert = do     putStrLn ("version: " ++ show (X509.certVersion cert))@@ -76,7 +96,7 @@     showDN $ X509.certIssuerDN cert     putStrLn "subject:"     showDN $ X509.certSubjectDN cert-    putStrLn ("valid:  " ++ show (X509.certValidity cert))+    putStrLn ("valid:  " ++ formatValidity (X509.certValidity cert))     case X509.certPubKey cert of         X509.PubKeyRSA pubkey -> do             putStrLn "public key RSA:"@@ -248,6 +268,13 @@                 putStrLn "DSA KEY" >> putStrLn (showDSAKey k)             _ -> error "private key unknown" +doSystemMain _ = do+    store <- getSystemCertificateStore+    let certs = listCertificates store+    mapM_ showCertSmall certs+    putStrLn $ replicate 72 '='+    putStrLn $ show (length certs) ++ " certificates loaded"+ optionsCert =     [ Option []     ["hash"] (NoArg ShowHash) "output certificate hash"     , Option ['v']  ["validate"] (NoArg Validate) "validate certificate"@@ -260,6 +287,9 @@ keyMain = getoptMain [] $ \o n -> doKeyMain n asn1Main = getoptMain [] $ \o n -> doASN1Main n +systemMain = getoptMain [] $ \o n -> doSystemMain n++ getoptMain :: [OptDescr a] -> ([a] -> [String] -> IO ()) -> [String] -> IO () getoptMain opts f as =     case getOpt Permute opts as of@@ -272,6 +302,7 @@     putStrLn "  cert: process X509 certificate"     putStrLn "  crl : process CRL certificate"     putStrLn "  asn1: show file asn1"+    putStrLn "  system: show system certificates"  main = do     args <- getArgs@@ -282,4 +313,5 @@         "key":as  -> keyMain as         "crl":as  -> crlMain as         "asn1":as -> asn1Main as+        "system":as -> systemMain as         _         -> usage

@@ -1,5 +1,5 @@ Name:                x509-util-Version:             1.6.0+Version:             1.6.1 Description:         utility to parse, show, validate, sign and produce X509 certificates and chain. License:             BSD3 License-file:        LICENSE@@ -27,6 +27,7 @@                    , asn1-encoding                    , pem                    , directory+                   , hourglass                    , cryptonite  source-repository head