From b57038891731bc5ab162fc8d32fa160d5a32c97c Mon Sep 17 00:00:00 2001
From: Vincent Hanquez <vincent@snarc.org>
Date: Fri, 3 Apr 2015 07:27:19 +0100
Subject: [PATCH] add simple chacha interface

---
 Crypto/Cipher/ChaCha.hs | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/Crypto/Cipher/ChaCha.hs b/Crypto/Cipher/ChaCha.hs
index 2bd2768..cb4e007 100644
--- a/Crypto/Cipher/ChaCha.hs
+++ b/Crypto/Cipher/ChaCha.hs
@@ -11,6 +11,10 @@ module Crypto.Cipher.ChaCha
     , combine
     , generate
     , State
+    -- * simple interface for DRG purpose
+    , initializeSimple
+    , generateSimple
+    , StateSimple
     ) where
 
 import Control.Applicative
@@ -18,6 +22,8 @@ import Data.SecureMem
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Internal as B
 import qualified Data.ByteString as B
+import Crypto.Internal.ByteArray
+import Crypto.Internal.Compat
 import Data.Byteable
 import Data.Word
 import Data.Bits (xor)
@@ -32,6 +38,9 @@ data State = State Int        -- number of rounds
                    SecureMem  -- ChaCha's state
                    ByteString -- previous generated chunk
 
+-- | ChaCha context for DRG purpose (see Crypto.Random.ChaChaDRG)
+newtype StateSimple = StateSimple SecureMem -- just ChaCha's state
+
 round64 :: Int -> (Bool, Int)
 round64 len
     | len == 0  = (True, 0)
@@ -59,6 +68,20 @@ initialize nbRounds key nonce
   where kLen     = byteableLength key
         nonceLen = B.length nonce
 
+-- | Initialize simple ChaCha State
+initializeSimple :: ByteArray seed
+                 => seed -- ^ a 40 bytes long seed
+                 -> StateSimple
+initializeSimple seed
+    | sLen /= 40 = error "ChaCha Random: seed length should be 40 bytes"
+    | otherwise = unsafeDoIO $ do
+        stPtr <- createSecureMem 64 $ \stPtr ->
+                    withByteArray seed $ \seedPtr ->
+                        ccryptonite_chacha_init (castPtr stPtr) 32 seedPtr 8 (seedPtr `plusPtr` 32)
+        return $ StateSimple stPtr
+  where
+    sLen = byteArrayLength seed
+
 -- | Combine the chacha output and an arbitrary message with a xor,
 -- and return the combined output and the new state.
 combine :: State      -- ^ the current ChaCha state
@@ -115,12 +138,27 @@ generate :: State -- ^ the current ChaCha state
          -> (ByteString, State)
 generate st len = combine st (B.replicate len 0)
 
+-- | similar to 'generate' but assume certains values
+generateSimple :: ByteArray ba
+               => StateSimple
+               -> Int
+               -> (ba, StateSimple)
+generateSimple (StateSimple prevSt) nbBytes = unsafeDoIO $ do
+    newSt  <- secureMemCopy prevSt
+    output <- byteArrayAlloc nbBytes $ \dstPtr ->
+        withSecureMemPtr newSt $ \stPtr ->
+            ccryptonite_chacha_random 8 dstPtr (castPtr stPtr) (fromIntegral nbBytes)
+    return (output, StateSimple newSt)
+
 foreign import ccall "cryptonite_chacha_init"
     ccryptonite_chacha_init :: Ptr State -> Int -> Ptr Word8 -> Int -> Ptr Word8 -> IO ()
 
 foreign import ccall "cryptonite_chacha_combine"
     ccryptonite_chacha_combine :: Int -> Ptr Word8 -> Ptr State -> Ptr Word8 -> CUInt -> IO ()
 
+foreign import ccall "cryptonite_chacha_random"
+    ccryptonite_chacha_random :: Int -> Ptr Word8 -> Ptr StateSimple -> CUInt -> IO ()
+
 {-
 foreign import ccall "cryptonite_chacha_generate"
     ccryptonite_chacha_generate :: Int -> Ptr Word8 -> Ptr State -> CUInt -> IO ()