Remove BaseConvert

We only use it for hex, which is in base, and base even has a utility
for arbitrary-base conversions.

5 files changed, 12 insertions, 44 deletions

diff --git a/Data/BaseConvert.hs b/Data/BaseConvert.hs
deleted file mode 100644
index 655f593..0000000
--- a/Data/BaseConvert.hs
+++ /dev/null
@@ -1,30 +0,0 @@
-module Data.BaseConvert (toString, toNum, toAlphaDigit, fromAlphaDigit) where
-
-import Data.Sequence
-import Data.Foldable (toList)
-import Data.List
-import Data.Char
-
-digit_alphabet :: [Char]
-digit_alphabet = ['0'..'9'] ++ ['A'..]
-
-toBase :: (Integral a) => a -> a -> [a]
-toBase _ 0 = [0]
-toBase b v = toList $
-        unfoldl (\n -> if n == 0 then Nothing else Just (n `divMod` b)) v
-
-toAlphaDigit :: (Integral a) => a -> Char
-toAlphaDigit = (digit_alphabet !!) . fromIntegral
-
-toString :: (Integral a) => a -> a -> String
-toString b v = map toAlphaDigit (toBase b v)
-
-fromAlphaDigit :: (Num a) => Char -> a
-fromAlphaDigit v = fromIntegral n
-        where Just n = elemIndex (toUpper v) digit_alphabet
-
-fromBase :: (Num a) => a -> [a] -> a
-fromBase b = foldl (\n k -> n * b + k) 0
-
-toNum :: (Num a) => a -> String -> a
-toNum b v = fromBase b (map fromAlphaDigit v)
diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index 54fc132..a5c2bef 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -45,9 +45,11 @@ module Data.OpenPGP (
         decode_s2k_count, encode_s2k_count
 ) where
 
+import Numeric
 import Control.Monad
 import Data.Bits
 import Data.Word
+import Data.Char
 import Data.Maybe
 import Data.Map (Map, (!))
 import qualified Data.Map as Map
@@ -61,8 +63,6 @@ import qualified Codec.Compression.Zlib.Raw as Zip
 import qualified Codec.Compression.Zlib as Zlib
 import qualified Codec.Compression.BZip as BZip2
 
-import qualified Data.BaseConvert as BaseConvert
-
 data Packet =
         SignaturePacket {
                 version::Word8,
@@ -241,7 +241,7 @@ put_packet (OnePassSignaturePacket { version = version,
                                      nested = nested }) =
         (LZ.concat [ encode version, encode signature_type,
                      encode hash_algorithm, encode key_algorithm,
-                     encode (BaseConvert.toNum 16 key_id :: Word64),
+                     encode (fst $ head $ readHex key_id :: Word64),
                      encode nested ], 4)
 put_packet (SecretKeyPacket { version = version, timestamp = timestamp,
                               key_algorithm = algorithm, key = key,
@@ -344,7 +344,7 @@ parse_packet  4 = do
                 signature_type = signature_type,
                 hash_algorithm = hash_algo,
                 key_algorithm = key_algo,
-                key_id = BaseConvert.toString 16 key_id,
+                key_id = map toUpper $ showHex key_id "",
                 nested = nested
         }
 -- SecretKeyPacket, http://tools.ietf.org/html/rfc4880#section-5.5.3
@@ -628,7 +628,7 @@ put_signature_subpacket :: SignatureSubpacket -> (LZ.ByteString, Word8)
 put_signature_subpacket (SignatureCreationTimePacket time) =
         (encode time, 2)
 put_signature_subpacket (IssuerPacket keyid) =
-        (encode (BaseConvert.toNum 16 keyid :: Word64), 16)
+        (encode (fst $ head $ readHex keyid :: Word64), 16)
 put_signature_subpacket (UnsupportedSignatureSubpacket tag bytes) =
         (bytes, tag)
 
@@ -647,7 +647,7 @@ parse_signature_subpacket  2 = fmap SignatureCreationTimePacket get
 -- IssuerPacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.5
 parse_signature_subpacket 16 = do
         keyid <- get :: Get Word64
-        return $ IssuerPacket (BaseConvert.toString 16 keyid)
+        return $ IssuerPacket (map toUpper $ showHex keyid "")
 -- Represent unsupported packets as their tag and literal bytes
 parse_signature_subpacket tag =
         fmap (UnsupportedSignatureSubpacket tag) getRemainingLazyByteString
diff --git a/Data/OpenPGP/Crypto.hs b/Data/OpenPGP/Crypto.hs
index 173fe08..052489d 100644
--- a/Data/OpenPGP/Crypto.hs
+++ b/Data/OpenPGP/Crypto.hs
@@ -6,7 +6,9 @@
 -- > import qualified Data.OpenPGP.Crypto as OpenPGP
 module Data.OpenPGP.Crypto (sign, verify, fingerprint) where
 
+import Numeric
 import Data.Word
+import Data.Char
 import Data.List (find)
 import Data.Map ((!))
 import qualified Data.ByteString.Lazy as LZ
@@ -22,16 +24,15 @@ import qualified Data.Digest.SHA384 as SHA384
 import qualified Data.Digest.SHA512 as SHA512
 
 import qualified Data.OpenPGP as OpenPGP
-import qualified Data.BaseConvert as BaseConvert
 
 -- | Generate a key fingerprint from a PublicKeyPacket or SecretKeyPacket
 -- <http://tools.ietf.org/html/rfc4880#section-12.2>
 fingerprint :: OpenPGP.Packet -> String
 fingerprint p | OpenPGP.version p == 4 =
-        BaseConvert.toString 16 $ SHA1.toInteger $ SHA1.hash $
+        map toUpper $ (`showHex` "") $ SHA1.toInteger $ SHA1.hash $
                 LZ.unpack (LZ.concat (OpenPGP.fingerprint_material p))
 fingerprint p | OpenPGP.version p `elem` [2, 3] =
-        concatMap (BaseConvert.toString 16) $
+        map toUpper $ foldr showHex "" $
                 MD5.hash $ LZ.unpack (LZ.concat (OpenPGP.fingerprint_material p))
 fingerprint _ = error "Unsupported Packet version or type in fingerprint."
 
diff --git a/Makefile b/Makefile
index 5aa7ef6..10f66fa 100644
--- a/Makefile
+++ b/Makefile
@@ -51,9 +51,9 @@ clean:
 debian/control: openpgp.cabal
         cabal-debian --update-debianization
 
-dist/build/libHSopenpgp-$(VERSION).a: openpgp.cabal dist/setup-config Data/BaseConvert.hs Data/OpenPGP.hs Data/OpenPGP/Crypto.hs
+dist/build/libHSopenpgp-$(VERSION).a: openpgp.cabal dist/setup-config Data/OpenPGP.hs Data/OpenPGP/Crypto.hs
         cabal build --ghc-options="$(GHCFLAGS)"
 
-dist/openpgp-$(VERSION).tar.gz: openpgp.cabal dist/setup-config Data/BaseConvert.hs Data/OpenPGP.hs Data/OpenPGP/Crypto.hs README
+dist/openpgp-$(VERSION).tar.gz: openpgp.cabal dist/setup-config Data/OpenPGP.hs Data/OpenPGP/Crypto.hs README
         cabal check
         cabal sdist
diff --git a/openpgp.cabal b/openpgp.cabal
index c20f6fc..0a40b94 100644
--- a/openpgp.cabal
+++ b/openpgp.cabal
@@ -128,9 +128,6 @@ library
                 Data.OpenPGP
                 Data.OpenPGP.Crypto
 
-        other-modules:
-                Data.BaseConvert
-
         build-depends:
                 base == 4.*,
                 containers,