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.

4 files changed, 0 insertions, 208 deletions

diff --git a/src/Internal/Base.chs b/src/Internal/Base.chs
deleted file mode 100644
index f0b03cc..0000000
--- a/src/Internal/Base.chs
+++ /dev/null
@@ -1,42 +0,0 @@
--- Copyright 2018 Google LLC
---
--- Licensed under the Apache License, Version 2.0 (the "License"); you may not
--- use this file except in compliance with the License. You may obtain a copy of
--- the License at
---
---     https://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
--- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
--- License for the specific language governing permissions and limitations under
--- the License.
-
-{-# OPTIONS_GHC -Wno-unused-imports #-}
-
-module Internal.Base where
-
-import Foreign (Ptr, nullPtr)
-
-#include <openssl/base.h>
-
--- | The BoringSSL @ENGINE@ type.
-data Engine
-{#pointer *ENGINE as 'Ptr Engine' -> Engine nocode#}
-
-noEngine :: Ptr Engine
-noEngine = nullPtr
-
--- | The BoringSSL @EVP_MD_CTX@ type, representing the state of a pending
--- hashing operation.
-data EVPMDCtx
-{#pointer *EVP_MD_CTX as 'Ptr EVPMDCtx' -> EVPMDCtx nocode#}
-
--- | The BoringSSL @EVP_MD@ type, representing a hash algorithm.
-data EVPMD
-{#pointer *EVP_MD as 'Ptr EVPMD' -> EVPMD nocode#}
-
--- | The BoringSSL @HMAC_CTX@ type, representing the state of a pending HMAC
--- operation.
-data HMACCtx
-{#pointer *HMAC_CTX as 'Ptr HMACCtx' -> HMACCtx nocode#}
diff --git a/src/Internal/Digest.chs b/src/Internal/Digest.chs
deleted file mode 100644
index bd331a7..0000000
--- a/src/Internal/Digest.chs
+++ /dev/null
@@ -1,67 +0,0 @@
--- Copyright 2018 Google LLC
---
--- Licensed under the Apache License, Version 2.0 (the "License"); you may not
--- use this file except in compliance with the License. You may obtain a copy of
--- the License at
---
---     https://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
--- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
--- License for the specific language governing permissions and limitations under
--- the License.
-
-{-# OPTIONS_GHC -Wno-missing-methods #-}
-
-module Internal.Digest
-  ( evpMD5, evpSHA1, evpSHA224, evpSHA256, evpSHA384, evpSHA512
-  , mallocEVPMDCtx
-  , evpDigestInitEx, evpDigestUpdate, evpDigestFinalEx
-  , evpMaxMDSize
-  ) where
-
-import Foreign (FinalizerPtr, ForeignPtr, Ptr, Storable(alignment, sizeOf))
-import Foreign.C.Types
-import Foreign.Ptr.Cast (asVoidPtr)
-
-import Foreign.Ptr.CreateWithFinalizer (createWithFinalizer)
-{#import Internal.Base#}
-import Result
-
-#include <openssl/digest.h>
-
-evpMD5, evpSHA1, evpSHA224, evpSHA256, evpSHA384, evpSHA512 :: Ptr EVPMD
-evpMD5    = {#call pure EVP_md5 as ^#}
-evpSHA1   = {#call pure EVP_sha1 as ^#}
-evpSHA224 = {#call pure EVP_sha224 as ^#}
-evpSHA256 = {#call pure EVP_sha256 as ^#}
-evpSHA384 = {#call pure EVP_sha384 as ^#}
-evpSHA512 = {#call pure EVP_sha512 as ^#}
-
--- | Memory-safe allocator for 'EVPMDCtx'.
-mallocEVPMDCtx :: IO (ForeignPtr EVPMDCtx)
-mallocEVPMDCtx =
-  createWithFinalizer {#call EVP_MD_CTX_init as ^#} btlsFinalizeEVPMDCtxPtr
-
-foreign import ccall "&btlsFinalizeEVPMDCtx"
-  btlsFinalizeEVPMDCtxPtr :: FinalizerPtr EVPMDCtx
-
-evpDigestInitEx :: Ptr EVPMDCtx -> Ptr EVPMD -> Ptr Engine -> IO ()
-evpDigestInitEx ctx md engine =
-  requireSuccess $ {#call EVP_DigestInit_ex as ^#} ctx md engine
-
-evpDigestUpdate :: Ptr EVPMDCtx -> Ptr a -> CULong -> IO ()
-evpDigestUpdate ctx md bytes =
-  alwaysSucceeds $ {#call EVP_DigestUpdate as ^#} ctx (asVoidPtr md) bytes
-
-evpDigestFinalEx :: Ptr EVPMDCtx -> Ptr CUChar -> Ptr CUInt -> IO ()
-evpDigestFinalEx ctx mdOut outSize =
-  alwaysSucceeds $ {#call EVP_DigestFinal_ex as ^#} ctx mdOut outSize
-
-evpMaxMDSize :: Int
-evpMaxMDSize = {#const EVP_MAX_MD_SIZE#}
-
-instance Storable EVPMDCtx where
-  sizeOf _ = {#sizeof EVP_MD_CTX#}
-  alignment _ = {#alignof EVP_MD_CTX#}
diff --git a/src/Internal/HKDF.chs b/src/Internal/HKDF.chs
deleted file mode 100644
index a3a48ed..0000000
--- a/src/Internal/HKDF.chs
+++ /dev/null
@@ -1,45 +0,0 @@
--- Copyright 2018 Google LLC
---
--- Licensed under the Apache License, Version 2.0 (the "License"); you may not
--- use this file except in compliance with the License. You may obtain a copy of
--- the License at
---
---     https://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
--- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
--- License for the specific language governing permissions and limitations under
--- the License.
-
-module Internal.HKDF
-  ( hkdfExtract, hkdfExpand
-  ) where
-
-import Foreign (Ptr)
-import Foreign.C.Types
-
-{#import Internal.Base#}
-import Result
-
-#include <openssl/hkdf.h>
-
-hkdfExtract ::
-  Ptr CUChar -> Ptr CULong
-  -> Ptr EVPMD
-  -> Ptr CUChar -> CULong
-  -> Ptr CUChar -> CULong
-  -> IO ()
-hkdfExtract outKey outLen digest secret secretLen salt saltLen =
-  requireSuccess $
-    {#call HKDF_extract as ^#} outKey outLen digest secret secretLen salt saltLen
-
-hkdfExpand ::
-  Ptr CUChar -> CULong
-  -> Ptr EVPMD
-  -> Ptr CUChar -> CULong
-  -> Ptr CUChar -> CULong
-  -> IO ()
-hkdfExpand outKey outLen digest prk prkLen info infoLen =
-  requireSuccess $
-    {#call HKDF_expand as ^#} outKey outLen digest prk prkLen info infoLen
diff --git a/src/Internal/HMAC.chs b/src/Internal/HMAC.chs
deleted file mode 100644
index 2151785..0000000
--- a/src/Internal/HMAC.chs
+++ /dev/null
@@ -1,54 +0,0 @@
--- Copyright 2018 Google LLC
---
--- Licensed under the Apache License, Version 2.0 (the "License"); you may not
--- use this file except in compliance with the License. You may obtain a copy of
--- the License at
---
---     https://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
--- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
--- License for the specific language governing permissions and limitations under
--- the License.
-
-{-# OPTIONS_GHC -Wno-missing-methods #-}
-
-module Internal.HMAC
-  ( mallocHMACCtx
-  , hmacInitEx, hmacUpdate, hmacFinal
-  ) where
-
-import Foreign (FinalizerPtr, ForeignPtr, Ptr, Storable(alignment, sizeOf))
-import Foreign.C.Types
-
-import Foreign.Ptr.Cast (asVoidPtr)
-import Foreign.Ptr.CreateWithFinalizer (createWithFinalizer)
-{#import Internal.Base#}
-import Result
-
-#include <openssl/hmac.h>
-
--- | Memory-safe allocator for 'HMACCtx'.
-mallocHMACCtx :: IO (ForeignPtr HMACCtx)
-mallocHMACCtx = createWithFinalizer {#call HMAC_CTX_init as ^#} hmacCtxCleanup
-
-foreign import ccall "&HMAC_CTX_cleanup"
-  hmacCtxCleanup :: FinalizerPtr HMACCtx
-
-hmacInitEx :: Ptr HMACCtx -> Ptr a -> CULong -> Ptr EVPMD -> Ptr Engine -> IO ()
-hmacInitEx ctx bytes size md engine =
-  requireSuccess $
-    {#call HMAC_Init_ex as ^#} ctx (asVoidPtr bytes) size md engine
-
-hmacUpdate :: Ptr HMACCtx -> Ptr CUChar -> CULong -> IO ()
-hmacUpdate ctx bytes size =
-  alwaysSucceeds $ {#call HMAC_Update as ^#} ctx bytes size
-
-hmacFinal :: Ptr HMACCtx -> Ptr CUChar -> Ptr CUInt -> IO ()
-hmacFinal ctx out outSize =
-  requireSuccess $ {#call HMAC_Final as ^#} ctx out outSize
-
-instance Storable HMACCtx where
-  sizeOf _ = {#sizeof HMAC_CTX#}
-  alignment _ = {#alignof HMAC_CTX#}