From d1a85eb87934d348c9789aec59c751fa615ec363 Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Thu, 23 Aug 2018 17:24:47 -0400 Subject: Clean up casts Use unsigned char buffers more pervasively throughout the code. This removes most calls to `asCUCharBuf`, isolating `unsafeCoerce` further. By making some type signatures slightly more flexible, also eliminate most explicit integer conversions. --- src/Data/Digest.hs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/Data/Digest.hs') diff --git a/src/Data/Digest.hs b/src/Data/Digest.hs index 0587d2b..3e6f263 100644 --- a/src/Data/Digest.hs +++ b/src/Data/Digest.hs @@ -27,7 +27,6 @@ import Foreign.Marshal.Unsafe (unsafeLocalState) import BTLS.BoringSSL.Base import BTLS.BoringSSL.Digest import BTLS.BoringSSLPatterns (initUpdateFinalize) -import BTLS.Cast (asCUCharBuf) import BTLS.Types (Algorithm(Algorithm), Digest(Digest)) type LazyByteString = ByteString.Lazy.ByteString @@ -45,13 +44,5 @@ hash :: Algorithm -> LazyByteString -> Digest hash (Algorithm md) = Digest . unsafeLocalState - . initUpdateFinalize mallocEVPMDCtx initialize evpDigestUpdate finalize - where - initialize ctx = evpDigestInitEx ctx md noEngine - - finalize ctx mdOut pOutSize = - -- 'mdOut' is a 'Ptr CChar'. However, to make life more interesting, - -- 'evpDigestFinalEx' requires a 'Ptr CUChar'. To work around this, - -- we're going to cheat and let Haskell reinterpret-cast 'mdOut' to 'Ptr - -- CUChar. - evpDigestFinalEx ctx (asCUCharBuf mdOut) pOutSize + . initUpdateFinalize mallocEVPMDCtx initialize evpDigestUpdate evpDigestFinalEx + where initialize ctx = evpDigestInitEx ctx md noEngine -- cgit v1.2.3