haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Curve25519] fix build and get rid of bytestring by using direct addr# "string"

Browse Source
This commit is contained in:
Vincent Hanquez 2015-05-02 07:59:42 +01:00
parent 35ae906755
commit d7a88da726
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Crypto/PubKey/Curve25519.hs
View File

@ -8,7 +8,7 @@
-- Curve25519 support -- Curve25519 support
-- --
{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE MagicHash #-}
module Crypto.PubKey.Curve25519 module Crypto.PubKey.Curve25519
( SecretKey ( SecretKey
, PublicKey , PublicKey
@ -24,19 +24,19 @@ module Crypto.PubKey.Curve25519
import Data.Word import Data.Word
import Foreign.Ptr import Foreign.Ptr
import GHC.Ptr
import Crypto.Internal.Compat import Crypto.Internal.Compat
import Crypto.Internal.Imports import Crypto.Internal.Imports
import Crypto.Internal.ByteArray (ByteArrayAccess, SecureBytes, withByteArray) import Crypto.Internal.ByteArray (ByteArrayAccess, SecureBytes, Bytes, withByteArray)
import qualified Crypto.Internal.ByteArray as B import qualified Crypto.Internal.ByteArray as B
import Data.ByteString (ByteString)
-- | A Curve25519 Secret key -- | A Curve25519 Secret key
newtype SecretKey = SecretKey SecureBytes newtype SecretKey = SecretKey SecureBytes
deriving (Show,Eq,ByteArrayAccess) deriving (Show,Eq,ByteArrayAccess)
-- | A Curve25519 public key -- | A Curve25519 public key
newtype PublicKey = PublicKey ByteString newtype PublicKey = PublicKey Bytes
deriving (Show,Eq,ByteArrayAccess) deriving (Show,Eq,ByteArrayAccess)
-- | A Curve25519 Diffie Hellman secret related to a -- | A Curve25519 Diffie Hellman secret related to a
@ -85,9 +85,6 @@ dhSecret bs
| B.length bs == 32 = Right $ DhSecret $ B.copyAndFreeze bs (\_ -> return ()) | B.length bs == 32 = Right $ DhSecret $ B.copyAndFreeze bs (\_ -> return ())
| otherwise = Left "invalid dh secret size" | otherwise = Left "invalid dh secret size"
basePoint :: PublicKey
basePoint = PublicKey "\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-- | Compute the Diffie Hellman secret from a public key and a secret key -- | Compute the Diffie Hellman secret from a public key and a secret key
dh :: PublicKey -> SecretKey -> DhSecret dh :: PublicKey -> SecretKey -> DhSecret
dh (PublicKey pub) (SecretKey sec) = DhSecret <$> dh (PublicKey pub) (SecretKey sec) = DhSecret <$>
@ -102,8 +99,9 @@ toPublic :: SecretKey -> PublicKey
toPublic (SecretKey sec) = PublicKey <$> toPublic (SecretKey sec) = PublicKey <$>
B.allocAndFreeze 32 $ \result -> B.allocAndFreeze 32 $ \result ->
withByteArray sec $ \psec -> withByteArray sec $ \psec ->
withByteArray basePoint $ \pbase -> ccryptonite_curve25519 result psec basePoint
ccryptonite_curve25519 result psec pbase where
basePoint = Ptr "\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"#
{-# NOINLINE toPublic #-} {-# NOINLINE toPublic #-}
foreign import ccall "cryptonite_curve25519_donna" foreign import ccall "cryptonite_curve25519_donna"