entropy 0.4.1.3 → 0.4.1.4

raw patch · 2 files changed

+18/−15 lines, 2 filesdep +Win32PVP ok

version bump matches the API change (PVP)

Dependencies added: Win32

API changes (from Hackage documentation)

Files

• System/EntropyWindows.hs +16/−14
• entropy.cabal +2/−1

@@ -17,6 +17,7 @@  import Control.Monad (liftM, when) import System.IO.Error (mkIOError, eofErrorType, ioeSetErrorString)+import System.Win32.Types (ULONG_PTR, errorWin) import Foreign (allocaBytes) import Data.ByteString as B import Data.ByteString.Internal as BI@@ -63,8 +64,9 @@ cpuHasRdRand = (/= 0) `fmap` c_cpu_has_rdrand #endif +type HCRYPTPROV = ULONG_PTR data CryptHandle-    = CH Word32+    = CH HCRYPTPROV   -- | Get random values from the hardward RNG or return Nothing if no@@ -86,7 +88,7 @@ hardwareRandom _ = pure Nothing #endif --- Define the constants we need from WinCrypt.h +-- Define the constants we need from WinCrypt.h msDefProv :: String msDefProv = "Microsoft Base Cryptographic Provider v1.0" provRSAFull :: Word32@@ -94,37 +96,37 @@ cryptVerifyContext :: Word32 cryptVerifyContext = fromIntegral 0xF0000000 --- Declare the required CryptoAPI imports +-- Declare the required CryptoAPI imports foreign import stdcall unsafe "CryptAcquireContextA"-   c_cryptAcquireCtx :: Ptr Word32 -> CString -> CString -> Word32 -> Word32 -> IO Int32+   c_cryptAcquireCtx :: Ptr HCRYPTPROV -> CString -> CString -> Word32 -> Word32 -> IO Int32 foreign import stdcall unsafe "CryptGenRandom"-   c_cryptGenRandom :: Word32 -> Word32 -> Ptr Word8 -> IO Int32+   c_cryptGenRandom :: HCRYPTPROV -> Word32 -> Ptr Word8 -> IO Int32 foreign import stdcall unsafe "CryptReleaseContext"-   c_cryptReleaseCtx :: Word32 -> Word32 -> IO Int32+   c_cryptReleaseCtx :: HCRYPTPROV -> Word32 -> IO Int32 -cryptAcquireCtx :: IO Word32+cryptAcquireCtx :: IO HCRYPTPROV cryptAcquireCtx =-   alloca $ \handlePtr -> +   alloca $ \handlePtr ->       withCString msDefProv $ \provName -> do          stat <- c_cryptAcquireCtx handlePtr nullPtr provName provRSAFull cryptVerifyContext          if (toBool stat)             then peek handlePtr-            else fail "c_cryptAcquireCtx"+            else errorWin "c_cryptAcquireCtx" -cryptGenRandom :: Word32 -> Int -> IO B.ByteString-cryptGenRandom h i = +cryptGenRandom :: HCRYPTPROV -> Int -> IO B.ByteString+cryptGenRandom h i =    BI.create i $ \c_buffer -> do       stat <- c_cryptGenRandom h (fromIntegral i) c_buffer       if (toBool stat)          then return ()-         else fail "c_cryptGenRandom"+         else errorWin "c_cryptGenRandom" -cryptReleaseCtx :: Word32 -> IO ()+cryptReleaseCtx :: HCRYPTPROV -> IO () cryptReleaseCtx h = do    stat <- c_cryptReleaseCtx h 0    if (toBool stat)       then return ()-      else fail "c_cryptReleaseCtx"+      else errorWin "c_cryptReleaseCtx"  -- |Open a handle from which random data can be read openHandle :: IO CryptHandle

@@ -1,5 +1,5 @@ name:           entropy-version:        0.4.1.3+version:        0.4.1.4 description:    A mostly platform independent (not GHCJS) method to obtain cryptographically strong entropy                 (RDRAND, urandom, CryptAPI, and patches welcome)                 Users looking for cryptographically strong (number-theoretically@@ -66,6 +66,7 @@     cpp-options: -Darch_i386     cc-options:  -Darch_i386 -O2   if os(windows)+    build-depends: Win32     cpp-options: -DisWindows     cc-options:  -DisWindows     extra-libraries: advapi32