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

[Curve25519] convert to Bytearray

Browse Source
This commit is contained in:
Vincent Hanquez 2015-04-22 06:26:06 +01:00
parent 4a82ef383d
commit 0424d67616
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Crypto/PubKey/Curve25519.hs
View File

@ -22,44 +22,41 @@ module Crypto.PubKey.Curve25519
, toPublic , toPublic
) where ) where
import Data.Byteable
import Data.ByteString (ByteString)
import Data.ByteString.Char8 ()
import qualified Data.ByteString.Internal as B
import Data.SecureMem
import Data.Word import Data.Word
import Foreign.Ptr import Foreign.Ptr
import Crypto.Internal.Compat import Crypto.Internal.Compat
import Crypto.Internal.Imports import Crypto.Internal.Imports
import Crypto.Internal.ByteArray
import Data.ByteString (ByteString)
-- | A Curve25519 Secret key -- | A Curve25519 Secret key
newtype SecretKey = SecretKey SecureMem newtype SecretKey = SecretKey SecureBytes
deriving (Show,Eq,Byteable) deriving (Show,Eq,ByteArrayAccess)
-- | A Curve25519 public key -- | A Curve25519 public key
newtype PublicKey = PublicKey ByteString newtype PublicKey = PublicKey ByteString
deriving (Show,Eq,Byteable) deriving (Show,Eq,ByteArrayAccess)
-- | A Curve25519 Diffie Hellman secret related to a -- | A Curve25519 Diffie Hellman secret related to a
-- public key and a secret key. -- public key and a secret key.
newtype DhSecret = DhSecret SecureMem newtype DhSecret = DhSecret SecureBytes
deriving (Show,Eq,Byteable) deriving (Show,Eq,ByteArrayAccess)
-- | Try to build a public key from a bytearray -- | Try to build a public key from a bytearray
publicKey :: Byteable bs => bs -> Either String PublicKey publicKey :: ByteArrayAccess bs => bs -> Either String PublicKey
publicKey bs publicKey bs
| byteableLength bs == 32 = Right $ PublicKey $ toBytes bs | byteArrayLength bs == 32 = Right $ PublicKey $ byteArrayCopyAndFreeze bs (\_ -> return ())
| otherwise = Left "invalid public key size" | otherwise = Left "invalid public key size"
-- | Try to build a secret key from a bytearray -- | Try to build a secret key from a bytearray
secretKey :: Byteable bs => bs -> Either String SecretKey secretKey :: ByteArrayAccess bs => bs -> Either String SecretKey
secretKey bs secretKey bs
| byteableLength bs == 32 = unsafeDoIO $ do | byteArrayLength bs == 32 = unsafeDoIO $ do
withBytePtr bs $ \inp -> do withByteArray bs $ \inp -> do
valid <- isValidPtr inp valid <- isValidPtr inp
if valid if valid
then Right . SecretKey <$> createSecureMem 32 (\sec -> B.memcpy sec inp 32) then Right . SecretKey <$> byteArrayCopy bs (\_ -> return ())
else return $ Left "invalid secret key" else return $ Left "invalid secret key"
| otherwise = Left "secret key invalid size" | otherwise = Left "secret key invalid size"
where where
@ -82,29 +79,29 @@ secretKey bs
{-# NOINLINE secretKey #-} {-# NOINLINE secretKey #-}
-- | Create a DhSecret from a bytearray object -- | Create a DhSecret from a bytearray object
dhSecret :: Byteable b => b -> Either String DhSecret dhSecret :: ByteArrayAccess b => b -> Either String DhSecret
dhSecret bs dhSecret bs
| byteableLength bs == 32 = Right $ DhSecret $ secureMemFromByteable bs | byteArrayLength bs == 32 = Right $ DhSecret $ byteArrayCopyAndFreeze bs (\_ -> return ())
| otherwise = Left "invalid dh secret size" | otherwise = Left "invalid dh secret size"
basePoint :: PublicKey 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" 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 <$> unsafeDoIO $ dh (PublicKey pub) (SecretKey sec) = DhSecret <$>
createSecureMem 32 $ \result -> byteArrayAllocAndFreeze 32 $ \result ->
withSecureMemPtr sec $ \psec -> withByteArray sec $ \psec ->
withBytePtr pub $ \ppub -> withByteArray pub $ \ppub ->
ccryptonite_curve25519 result psec ppub ccryptonite_curve25519 result psec ppub
{-# NOINLINE dh #-} {-# NOINLINE dh #-}
-- | Create a public key from a secret key -- | Create a public key from a secret key
toPublic :: SecretKey -> PublicKey toPublic :: SecretKey -> PublicKey
toPublic (SecretKey sec) = PublicKey <$> toPublic (SecretKey sec) = PublicKey <$>
B.unsafeCreate 32 $ \result -> byteArrayAllocAndFreeze 32 $ \result ->
withSecureMemPtr sec $ \psec -> withByteArray sec $ \psec ->
withBytePtr basePoint $ \pbase -> withByteArray basePoint $ \pbase ->
ccryptonite_curve25519 result psec pbase ccryptonite_curve25519 result psec pbase
{-# NOINLINE toPublic #-} {-# NOINLINE toPublic #-}

6
tests/KAT_Curve25519.hs
View File

@ -2,7 +2,7 @@
module KAT_Curve25519 ( tests ) where module KAT_Curve25519 ( tests ) where
import qualified Crypto.PubKey.Curve25519 as Curve25519 import qualified Crypto.PubKey.Curve25519 as Curve25519
import Data.Byteable import Crypto.Internal.ByteArray
import Imports import Imports
alicePrivate = either error id $ Curve25519.secretKey ("\x77\x07\x6d\x0a\x73\x18\xa5\x7d\x3c\x16\xc1\x72\x51\xb2\x66\x45\xdf\x4c\x2f\x87\xeb\xc0\x99\x2a\xb1\x77\xfb\xa5\x1d\xb9\x2c\x2a" :: ByteString) alicePrivate = either error id $ Curve25519.secretKey ("\x77\x07\x6d\x0a\x73\x18\xa5\x7d\x3c\x16\xc1\x72\x51\xb2\x66\x45\xdf\x4c\x2f\x87\xeb\xc0\x99\x2a\xb1\x77\xfb\xa5\x1d\xb9\x2c\x2a" :: ByteString)
@ -13,8 +13,8 @@ aliceMultBob = "\x4a\x5d\x9d\x5b\xa4\xce\x2d\xe1\x72\x8e\x3b\xf4\x80\x35\x0f\x25
katTests :: [TestTree] katTests :: [TestTree]
katTests = katTests =
[ testCase "0" (aliceMultBob @=? toBytes (Curve25519.dh alicePublic bobPrivate)) [ testCase "0" (aliceMultBob @=? byteArrayConvert (Curve25519.dh alicePublic bobPrivate))
, testCase "1" (aliceMultBob @=? toBytes (Curve25519.dh bobPublic alicePrivate)) , testCase "1" (aliceMultBob @=? byteArrayConvert (Curve25519.dh bobPublic alicePrivate))
] ]
tests = testGroup "Curve25519" tests = testGroup "Curve25519"