From 2152e7728db7e0cf86ea23d29a05294af24b6898 Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Thu, 2 Aug 2018 17:08:44 -0400 Subject: Begin cleaning up internal modules Clarify the division between internal and external modules in the source by consolidating all internal modules except Data.Digest.Internal into a flatter BTLS directory. --- src/Data/Digest.hs | 4 ++-- src/Data/Digest/Internal.hs | 4 ++-- src/Data/HMAC.hs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Data') diff --git a/src/Data/Digest.hs b/src/Data/Digest.hs index b5c7390..2d06389 100644 --- a/src/Data/Digest.hs +++ b/src/Data/Digest.hs @@ -27,9 +27,9 @@ import Foreign.C.Types import Foreign.Marshal.Unsafe (unsafeLocalState) import Unsafe.Coerce (unsafeCoerce) +import BTLS.BoringSSL.Base +import BTLS.BoringSSL.Digest import Data.Digest.Internal -import Internal.Base -import Internal.Digest type LazyByteString = ByteString.Lazy.ByteString diff --git a/src/Data/Digest/Internal.hs b/src/Data/Digest/Internal.hs index 02b879c..88a0d9f 100644 --- a/src/Data/Digest/Internal.hs +++ b/src/Data/Digest/Internal.hs @@ -28,8 +28,8 @@ import Data.Word (Word8) import Foreign (ForeignPtr, Storable(peek), Ptr, alloca, allocaArray, withForeignPtr) import Foreign.C.Types -import Internal.Base (EVPMD) -import Internal.Digest (evpMaxMDSize) +import BTLS.BoringSSL.Base (EVPMD) +import BTLS.BoringSSL.Digest (evpMaxMDSize) type LazyByteString = ByteString.Lazy.ByteString diff --git a/src/Data/HMAC.hs b/src/Data/HMAC.hs index 85e6886..29b6ce0 100644 --- a/src/Data/HMAC.hs +++ b/src/Data/HMAC.hs @@ -26,12 +26,12 @@ import Foreign.C.Types import Foreign.Marshal.Unsafe (unsafeLocalState) import Unsafe.Coerce (unsafeCoerce) +import BTLS.BoringSSL.Base +import BTLS.BoringSSL.HMAC +import BTLS.ConstantTimeEquals (constantTimeEquals) +import BTLS.Types (SecretKey(SecretKey)) import Data.Digest.Internal (Algorithm(Algorithm), Digest(Digest), initUpdateFinalize) -import Foreign.Ptr.ConstantTimeEquals (constantTimeEquals) -import Internal.Base -import Internal.HMAC -import Types (SecretKey(SecretKey)) type LazyByteString = ByteString.Lazy.ByteString -- cgit v1.2.3