From 924d0109218f04f4a34bbfe1f5d18b75e1d9a66d Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Fri, 28 Sep 2018 17:20:36 -0400 Subject: Stop using newtypes for labeled arguments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s getting messy, so switch to a parameters datatype pattern. --- src/BTLS/Types.hs | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'src/BTLS/Types.hs') diff --git a/src/BTLS/Types.hs b/src/BTLS/Types.hs index 6abd632..7a821f8 100644 --- a/src/BTLS/Types.hs +++ b/src/BTLS/Types.hs @@ -14,10 +14,6 @@ module BTLS.Types where -import Data.ByteString (ByteString) -import qualified Data.ByteString as ByteString -import qualified Data.ByteString.Base16 as ByteString.Base16 -import qualified Data.ByteString.Char8 as ByteString.Char8 import Foreign (Ptr, nullPtr) import Foreign.C (peekCString) import Foreign.Marshal.Unsafe (unsafeLocalState) @@ -36,34 +32,3 @@ instance Show Algorithm where show (Algorithm md) = let sn = objNID2SN (evpMDType md) in if sn == nullPtr then "" else unsafeLocalState (peekCString sn) - --- | Context or application-specific information. Equality comparisons on this --- type are variable-time. -newtype AssociatedData = AssociatedData ByteString - deriving (Eq, Ord, Show) - --- | The result of a hash operation. Equality comparisons on this type are --- variable-time. --- --- The 'Show' instance for this type displays the digest as a hexadecimal string. -newtype Digest = Digest ByteString - deriving (Eq, Ord) - -instance Show Digest where - show (Digest d) = showHex d - --- | A salt. Equality comparisons on this type are variable-time. -newtype Salt = Salt ByteString - deriving (Eq, Ord, Show) - --- | A special value used to request that no salt be used. -noSalt :: Salt -noSalt = Salt ByteString.empty - --- | A secret key used as input to a cipher or HMAC. Equality comparisons on --- this type are variable-time. -newtype SecretKey = SecretKey ByteString - deriving (Eq, Ord, Show) - -showHex :: ByteString -> String -showHex = ByteString.Char8.unpack . ByteString.Base16.encode \ No newline at end of file -- cgit v1.2.3