Skip to content

Commit

Permalink
DirectSerialise
Browse files Browse the repository at this point in the history
  • Loading branch information
tdammers committed Jun 22, 2023
1 parent d261d26 commit 70d4fa9
Show file tree
Hide file tree
Showing 14 changed files with 580 additions and 19 deletions.
1 change: 1 addition & 0 deletions cardano-crypto-class/cardano-crypto-class.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ library
import: base, project-config
hs-source-dirs: src
exposed-modules:
Cardano.Crypto.DirectSerialise
Cardano.Crypto.DSIGN
Cardano.Crypto.DSIGN.Class
Cardano.Crypto.DSIGN.Ed25519
Expand Down
55 changes: 54 additions & 1 deletion cardano-crypto-class/src/Cardano/Crypto/DSIGN/Ed25519.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE StandaloneDeriving #-}
Expand Down Expand Up @@ -66,14 +67,17 @@ import Cardano.Crypto.Libsodium.MLockedSeed
import Cardano.Crypto.PinnedSizedBytes
( PinnedSizedBytes
, psbUseAsSizedPtr
, psbUseAsCPtrLen
, psbToByteString
, psbFromByteStringCheck
, psbCreate
, psbCreateSized
, psbCreateSizedResult
)
import Cardano.Crypto.Seed
import Cardano.Crypto.Util (SignableRepresentation(..))
import Cardano.Foreign
import Cardano.Crypto.DirectSerialise



Expand Down Expand Up @@ -262,7 +266,7 @@ instance DSIGNMAlgorithm Ed25519DSIGN where
withLiftST $ \fromST -> fromST $ do
cOrError $ unsafeIOToST $
c_crypto_sign_ed25519_sk_to_pk pkPtr skPtr
throwOnErrno "deriveVerKeyDSIGNM @Ed25519DSIGN" "c_crypto_sign_ed25519_sk_to_pk" maybeErrno
throwOnErrno "deriveVerKeyDSIGN @Ed25519DSIGN" "c_crypto_sign_ed25519_sk_to_pk" maybeErrno
return psb


Expand Down Expand Up @@ -368,3 +372,52 @@ instance TypeError ('Text "CBOR encoding would violate mlocking guarantees")
instance TypeError ('Text "CBOR decoding would violate mlocking guarantees")
=> FromCBOR (SignKeyDSIGNM Ed25519DSIGN) where
fromCBOR = error "unsupported"

instance ( MonadThrow m
, MonadST m
) => DirectSerialise m (SignKeyDSIGNM Ed25519DSIGN) where
-- /Note:/ We only serialize the 32-byte seed, not the full 64-byte key. The
-- latter contains both the seed and the 32-byte verification key, which is
-- convenient, but redundant, since we can always reconstruct it from the
-- seed. This is also reflected in the 'SizeSignKeyDSIGNM', which equals
-- 'SeedSizeDSIGNM' == 32, rather than reporting the in-memory size of 64.
directSerialise push sk = do
bracket
(getSeedDSIGNM (Proxy @Ed25519DSIGN) sk)
mlockedSeedFinalize
(\seed -> mlockedSeedUseAsCPtr seed $ \ptr ->
push
(castPtr ptr)
(fromIntegral $ seedSizeDSIGN (Proxy @Ed25519DSIGN)))

instance ( MonadThrow m
, MonadST m
) => DirectDeserialise m (SignKeyDSIGNM Ed25519DSIGN) where
-- /Note:/ We only serialize the 32-byte seed, not the full 64-byte key. See
-- the DirectSerialise m instance above.
directDeserialise pull = do
bracket
mlockedSeedNew
mlockedSeedFinalize
(\seed -> do
mlockedSeedUseAsCPtr seed $ \ptr -> do
pull
(castPtr ptr)
(fromIntegral $ seedSizeDSIGN (Proxy @Ed25519DSIGN))
genKeyDSIGNM seed
)

instance MonadST m => DirectSerialise m (VerKeyDSIGN Ed25519DSIGN) where
directSerialise push (VerKeyEd25519DSIGN psb) = do
psbUseAsCPtrLen psb $ \ptr _ ->
push
(castPtr ptr)
(fromIntegral $ sizeVerKeyDSIGN (Proxy @Ed25519DSIGN))

instance MonadST m => DirectDeserialise m (VerKeyDSIGN Ed25519DSIGN) where
directDeserialise pull = do
psb <- psbCreate $ \ptr ->
pull
(castPtr ptr)
(fromIntegral $ sizeVerKeyDSIGN (Proxy @Ed25519DSIGN))
return $! VerKeyEd25519DSIGN $! psb
41 changes: 41 additions & 0 deletions cardano-crypto-class/src/Cardano/Crypto/DirectSerialise.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{-# LANGUAGE MultiParamTypeClasses #-}

-- | Direct (de-)serialisation to / from raw memory.
--
-- The purpose of the typeclasses in this module is to abstract over data
-- structures that can expose the data they store as one or more raw 'Ptr's,
-- without any additional memory copying or conversion to intermediate data
-- structures.
--
-- This is useful for transmitting data like KES SignKeys over a socket
-- connection: by accessing the memory directly and copying it into or out of
-- a file descriptor, without going through an intermediate @ByteString@
-- representation (or other data structure that resides in the GHC heap), we
-- can more easily assure that the data is never written to disk, including
-- swap, which is an important requirement for KES.
module Cardano.Crypto.DirectSerialise
where

import Foreign.Ptr
import Foreign.C.Types

-- | Direct deserialization from raw memory.
--
-- @directDeserialise f@ should allocate a new value of type 'a', and
-- call @f@ with a pointer to the raw memory to be filled. @f@ may be called
-- multiple times, for data structures that store their data in multiple
-- non-contiguous blocks of memory.
--
-- The order in which memory blocks are visited matters.
class DirectDeserialise m a where
directDeserialise :: (Ptr CChar -> CSize -> m ()) -> m a

-- | Direct serialization to raw memory.
--
-- @directSerialise f x@ should call @f@ to expose the raw memory underyling
-- @x@. For data types that store their data in multiple non-contiguous blocks
-- of memory, @f@ may be called multiple times, once for each block.
--
-- The order in which memory blocks are visited matters.
class DirectSerialise m a where
directSerialise :: (Ptr CChar -> CSize -> m ()) -> a -> m ()
18 changes: 17 additions & 1 deletion cardano-crypto-class/src/Cardano/Crypto/KES/CompactSingle.hs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import Cardano.Binary (FromCBOR (..), ToCBOR (..))
import Cardano.Crypto.Hash.Class
import Cardano.Crypto.DSIGN.Class as DSIGN
import Cardano.Crypto.KES.Class

import Cardano.Crypto.DirectSerialise

-- | A standard signature scheme is a forward-secure signature scheme with a
-- single time period.
Expand Down Expand Up @@ -227,3 +227,19 @@ instance (DSIGNMAlgorithm d, KnownNat (SizeSigKES (CompactSingleKES d))) => From
slice :: Word -> Word -> ByteString -> ByteString
slice offset size = BS.take (fromIntegral size)
. BS.drop (fromIntegral offset)

--
-- Direct ser/deser
--

instance (DirectSerialise m (SignKeyDSIGNM d)) => DirectSerialise m (SignKeyKES (CompactSingleKES d)) where
directSerialise push (SignKeyCompactSingleKES sk) = directSerialise push sk

instance (Monad m, DirectDeserialise m (SignKeyDSIGNM d)) => DirectDeserialise m (SignKeyKES (CompactSingleKES d)) where
directDeserialise pull = SignKeyCompactSingleKES <$!> directDeserialise pull

instance (DirectSerialise m (VerKeyDSIGN d)) => DirectSerialise m (VerKeyKES (CompactSingleKES d)) where
directSerialise push (VerKeyCompactSingleKES sk) = directSerialise push sk

instance (Monad m, DirectDeserialise m (VerKeyDSIGN d)) => DirectDeserialise m (VerKeyKES (CompactSingleKES d)) where
directDeserialise pull = VerKeyCompactSingleKES <$!> directDeserialise pull
60 changes: 59 additions & 1 deletion cardano-crypto-class/src/Cardano/Crypto/KES/CompactSum.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE UndecidableInstances #-}
Expand Down Expand Up @@ -86,7 +87,7 @@ module Cardano.Crypto.KES.CompactSum (
import Data.Proxy (Proxy(..))
import GHC.Generics (Generic)
import qualified Data.ByteString as BS
import Control.Monad (guard)
import Control.Monad (guard, (<$!>))
import NoThunks.Class (NoThunks, OnlyCheckWhnfNamed (..))

import Cardano.Binary (FromCBOR (..), ToCBOR (..))
Expand All @@ -97,10 +98,16 @@ import Cardano.Crypto.KES.CompactSingle (CompactSingleKES)
import Cardano.Crypto.Util
import Cardano.Crypto.Libsodium.MLockedSeed
import Cardano.Crypto.Libsodium
import Cardano.Crypto.Libsodium.Memory
import Cardano.Crypto.DirectSerialise

import Control.Monad.Trans.Maybe (MaybeT (..), runMaybeT)
import Control.Monad.Trans (lift)
import Control.Monad.Class.MonadST
import Control.Monad.Class.MonadThrow
import Control.DeepSeq (NFData (..))
import GHC.TypeLits (KnownNat, type (+), type (*))
import Foreign.Ptr (castPtr)

-- | A 2^0 period KES
type CompactSum0KES d = CompactSingleKES d
Expand Down Expand Up @@ -461,3 +468,54 @@ instance ( OptimizedKESAlgorithm d
)
=> FromCBOR (SigKES (CompactSumKES h d)) where
fromCBOR = decodeSigKES


--
-- Direct ser/deser
--

instance ( DirectSerialise m (SignKeyKES d)
, DirectSerialise m (VerKeyKES d)
, MonadST m
, KESAlgorithm d
) => DirectSerialise m (SignKeyKES (CompactSumKES h d)) where
directSerialise push (SignKeyCompactSumKES sk r vk0 vk1) = do
directSerialise push sk
mlockedSeedUseAsCPtr r $ \ptr ->
push (castPtr ptr) (fromIntegral $ seedSizeKES (Proxy :: Proxy d))
directSerialise push vk0
directSerialise push vk1

instance ( DirectDeserialise m (SignKeyKES d)
, DirectDeserialise m (VerKeyKES d)
, MonadST m
, KESAlgorithm d
) => DirectDeserialise m (SignKeyKES (CompactSumKES h d)) where
directDeserialise pull = do
sk <- directDeserialise pull

r <- mlockedSeedNew
mlockedSeedUseAsCPtr r $ \ptr ->
pull (castPtr ptr) (fromIntegral $ seedSizeKES (Proxy :: Proxy d))

vk0 <- directDeserialise pull
vk1 <- directDeserialise pull

return $! SignKeyCompactSumKES sk r vk0 vk1


instance (MonadST m, MonadThrow m)
=> DirectSerialise m (VerKeyKES (CompactSumKES h d)) where
directSerialise push (VerKeyCompactSumKES h) =
unpackByteStringCStringLen (hashToBytes h) $ \(ptr, len) ->
push (castPtr ptr) (fromIntegral len)

instance (MonadST m, MonadThrow m, MonadFail m, HashAlgorithm h)
=> DirectDeserialise m (VerKeyKES (CompactSumKES h d)) where
directDeserialise pull = do
let len :: Num a => a
len = fromIntegral $ sizeHash (Proxy @h)
allocaBytes len $ \ptr -> do
pull ptr len
bs <- packByteStringCStringLen (ptr, len)
maybe (fail "Invalid hash") return $! VerKeyCompactSumKES <$!> hashFromBytes bs
36 changes: 36 additions & 0 deletions cardano-crypto-class/src/Cardano/Crypto/KES/Mock.hs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import GHC.TypeNats (Nat, KnownNat, natVal)
import NoThunks.Class (NoThunks)

import Control.Exception (assert)
import Control.Monad.Class.MonadST (MonadST)
import Control.Monad.Class.MonadThrow (MonadThrow)

import Cardano.Binary (FromCBOR (..), ToCBOR (..))

Expand All @@ -37,6 +39,12 @@ import Cardano.Crypto.Libsodium.MLockedSeed
import Cardano.Crypto.Libsodium
( mlsbAsByteString
)
import Cardano.Crypto.Libsodium.Memory
( unpackByteStringCStringLen
, packByteStringCStringLen
, allocaBytes
)
import Cardano.Crypto.DirectSerialise

data MockKES (t :: Nat)

Expand Down Expand Up @@ -194,3 +202,31 @@ instance KnownNat t => ToCBOR (SigKES (MockKES t)) where

instance KnownNat t => FromCBOR (SigKES (MockKES t)) where
fromCBOR = decodeSigKES

instance (MonadST m, MonadThrow m, KnownNat t) => DirectSerialise m (SignKeyKES (MockKES t)) where
directSerialise put sk = do
let bs = rawSerialiseSignKeyMockKES sk
unpackByteStringCStringLen bs $ \(cstr, len) -> put cstr (fromIntegral len)

instance (MonadST m, MonadThrow m, KnownNat t) => DirectDeserialise m (SignKeyKES (MockKES t)) where
directDeserialise pull = do
let len = fromIntegral $ sizeSignKeyKES (Proxy @(MockKES t))
bs <- allocaBytes len $ \cstr -> do
pull cstr (fromIntegral len)
packByteStringCStringLen (cstr, len)
maybe (error "directDeserialise @(SignKeyKES (MockKES t))") return $
rawDeserialiseSignKeyMockKES bs

instance (MonadST m, MonadThrow m, KnownNat t) => DirectSerialise m (VerKeyKES (MockKES t)) where
directSerialise put sk = do
let bs = rawSerialiseVerKeyKES sk
unpackByteStringCStringLen bs $ \(cstr, len) -> put cstr (fromIntegral len)

instance (MonadST m, MonadThrow m, KnownNat t) => DirectDeserialise m (VerKeyKES (MockKES t)) where
directDeserialise pull = do
let len = fromIntegral $ sizeVerKeyKES (Proxy @(MockKES t))
bs <- allocaBytes len $ \cstr -> do
pull cstr (fromIntegral len)
packByteStringCStringLen (cstr, len)
maybe (error "directDeserialise @(VerKeyKES (MockKES t))") return $
rawDeserialiseVerKeyKES bs
20 changes: 20 additions & 0 deletions cardano-crypto-class/src/Cardano/Crypto/KES/Simple.hs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import Cardano.Crypto.KES.Class
import Cardano.Crypto.Libsodium.MLockedSeed
import Cardano.Crypto.Libsodium.MLockedBytes
import Cardano.Crypto.Util
import Cardano.Crypto.DirectSerialise
import Data.Unit.Strict (forceElemsToWHNF)

data SimpleKES d (t :: Nat)
Expand Down Expand Up @@ -249,3 +250,22 @@ instance (DSIGNMAlgorithm d
=> FromCBOR (SigKES (SimpleKES d t)) where
fromCBOR = decodeSigKES

instance (Monad m, DirectSerialise m (VerKeyDSIGN d)) => DirectSerialise m (VerKeyKES (SimpleKES d t)) where
directSerialise push (VerKeySimpleKES vks) =
mapM_ (directSerialise push) vks

instance (Monad m, DirectDeserialise m (VerKeyDSIGN d), KnownNat t) => DirectDeserialise m (VerKeyKES (SimpleKES d t)) where
directDeserialise pull = do
let duration = fromIntegral (natVal (Proxy :: Proxy t))
vks <- Vec.replicateM duration (directDeserialise pull)
return $! VerKeySimpleKES $! vks

instance (Monad m, DirectSerialise m (SignKeyDSIGNM d)) => DirectSerialise m (SignKeyKES (SimpleKES d t)) where
directSerialise push (SignKeySimpleKES sks) =
mapM_ (directSerialise push) sks

instance (Monad m, DirectDeserialise m (SignKeyDSIGNM d), KnownNat t) => DirectDeserialise m (SignKeyKES (SimpleKES d t)) where
directDeserialise pull = do
let duration = fromIntegral (natVal (Proxy :: Proxy t))
sks <- Vec.replicateM duration (directDeserialise pull)
return $! SignKeySimpleKES $! sks
19 changes: 17 additions & 2 deletions cardano-crypto-class/src/Cardano/Crypto/KES/Single.hs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import Cardano.Binary (FromCBOR (..), ToCBOR (..))
import Cardano.Crypto.Hash.Class
import Cardano.Crypto.DSIGN.Class as DSIGN
import Cardano.Crypto.KES.Class

import Cardano.Crypto.DirectSerialise

-- | A standard signature scheme is a forward-secure signature scheme with a
-- single time period.
Expand Down Expand Up @@ -187,4 +187,19 @@ instance DSIGNMAlgorithm d => ToCBOR (SigKES (SingleKES d)) where

instance DSIGNMAlgorithm d => FromCBOR (SigKES (SingleKES d)) where
fromCBOR = decodeSigKES
{-# INLINE fromCBOR #-}

--
-- Direct ser/deser
--

instance (DirectSerialise m (SignKeyDSIGNM d)) => DirectSerialise m (SignKeyKES (SingleKES d)) where
directSerialise push (SignKeySingleKES sk) = directSerialise push sk

instance (Monad m, DirectDeserialise m (SignKeyDSIGNM d)) => DirectDeserialise m (SignKeyKES (SingleKES d)) where
directDeserialise pull = SignKeySingleKES <$!> directDeserialise pull

instance (DirectSerialise m (VerKeyDSIGN d)) => DirectSerialise m (VerKeyKES (SingleKES d)) where
directSerialise push (VerKeySingleKES sk) = directSerialise push sk

instance (Monad m, DirectDeserialise m (VerKeyDSIGN d)) => DirectDeserialise m (VerKeyKES (SingleKES d)) where
directDeserialise pull = VerKeySingleKES <$!> directDeserialise pull
Loading

0 comments on commit 70d4fa9

Please sign in to comment.