From 109600cec24e592198cbebbe3d7ad3035ba177e5 Mon Sep 17 00:00:00 2001 From: Crockett Date: Sun, 3 Feb 2019 13:43:54 -0800 Subject: [PATCH] Added missing imports and removed duplicate imports. Tests pass. --- Crypto/PubKey/DSA.hs | 5 +---- Crypto/PubKey/ECC/ECDSA.hs | 10 +++------- Crypto/PubKey/Internal.hs | 5 +++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Crypto/PubKey/DSA.hs b/Crypto/PubKey/DSA.hs index 2bb7ac3..b23df98 100644 --- a/Crypto/PubKey/DSA.hs +++ b/Crypto/PubKey/DSA.hs @@ -29,14 +29,11 @@ module Crypto.PubKey.DSA ) where import Crypto.Random.Types -import qualified Data.Bits as Bits (shiftL, (.|.), shiftR) import Data.Data import Data.Maybe -import Crypto.Number.Basic (numBits) import Crypto.Number.ModArithmetic (expFast, expSafe, inverse) -import Crypto.Number.Serialize import Crypto.Number.Generate -import Crypto.Internal.ByteArray (ByteArrayAccess, ByteArray, ScrubbedBytes, convert, index, dropView, takeView, pack, unpack) +import Crypto.Internal.ByteArray (ByteArrayAccess) import Crypto.Internal.Imports import Crypto.Hash import Crypto.PubKey.Internal (dsaTruncHash) diff --git a/Crypto/PubKey/ECC/ECDSA.hs b/Crypto/PubKey/ECC/ECDSA.hs index fb03a52..3dab3dd 100644 --- a/Crypto/PubKey/ECC/ECDSA.hs +++ b/Crypto/PubKey/ECC/ECDSA.hs @@ -16,19 +16,15 @@ module Crypto.PubKey.ECC.ECDSA ) where import Control.Monad -import Crypto.Random.Types -import Data.Bits (shiftR) +import Crypto.Hash import Crypto.Internal.ByteArray (ByteArrayAccess) -import Data.Data -import Crypto.Number.Basic (numBits) import Crypto.Number.ModArithmetic (inverse) -import Crypto.Number.Serialize import Crypto.Number.Generate import Crypto.PubKey.ECC.Types import Crypto.PubKey.ECC.Prim import Crypto.PubKey.Internal (dsaTruncHash) -import Crypto.Hash -import Crypto.Hash.Types (hashDigestSize) +import Crypto.Random.Types +import Data.Data -- | Represent a ECDSA signature namely R and S. data Signature = Signature diff --git a/Crypto/PubKey/Internal.hs b/Crypto/PubKey/Internal.hs index 945f1f0..a1dd8b9 100644 --- a/Crypto/PubKey/Internal.hs +++ b/Crypto/PubKey/Internal.hs @@ -11,6 +11,11 @@ module Crypto.PubKey.Internal , dsaTruncHash ) where +import Crypto.Hash +import Crypto.Internal.ByteArray (ByteArrayAccess) +import Crypto.Number.Basic (numBits) +import Crypto.Number.Serialize +import Data.Bits (shiftR) import Data.List (foldl') -- | This is a strict version of and