1 files changed, 30 insertions, 12 deletions

diff --git a/Data/OpenPGP/Internal.hs b/Data/OpenPGP/Internal.hs
index 175a62e..f9a8803 100644
--- a/Data/OpenPGP/Internal.hs
+++ b/Data/OpenPGP/Internal.hs
@@ -16,20 +16,20 @@ import           System.IO.Unsafe
 
 
 decode_s2k_count :: Word8 -> Word32
-decode_s2k_count c =  (16 + (fromIntegral c .&. 15)) `shiftL`
-        ((fromIntegral c `shiftR` 4) + 6)
+decode_s2k_count c = shiftL (16 + (fromIntegral c .&. 15))
+                            ((fromIntegral c `shiftR` 4) + 6)
 
 encode_s2k_count :: Word32 -> Word8
 encode_s2k_count iterations
-        | iterations >= 65011712 = 255
-        | decode_s2k_count result < iterations = result+1
-        | otherwise = result
-        where
-        result = fromIntegral $ (fromIntegral c `shiftL` 4) .|. (count - 16)
-        (count, c) = encode_s2k_count' (iterations `shiftR` 6) (0::Word8)
-        encode_s2k_count' count c
-                | count < 32 = (count, c)
-                | otherwise = encode_s2k_count' (count `shiftR` 1) (c+1)
+    | iterations >= 65011712 = 255
+    | decode_s2k_count result < iterations = result+1
+    | otherwise = result
+    where
+    result = fromIntegral $ (fromIntegral c `shiftL` 4) .|. (count - 16)
+    (count, c) = encode_s2k_count' (iterations `shiftR` 6) (0::Word8)
+    encode_s2k_count' count c
+        | count < 32 = (count, c)
+        | otherwise = encode_s2k_count' (count `shiftR` 1) (c+1)
 
 {-
 getBigNum :: BS.ByteString -> Integer
@@ -70,8 +70,26 @@ putBigNum i = ( (fromIntegral (BS.length bytes) - 1) * 8 + sigBit
     sigBit = fromIntegral $ 8 - countLeadingZeros (BS.index bytes 0)
     bytes = integerToBS i
 
+-- big-endian
 integerToBS :: Integer -> BS.ByteString
 integerToBS i = BS.unsafeCreate (I# (word2Int# (sizeInBaseInteger i 256#))) $ \ptr -> do
         let Ptr addr = ptr
-        cnt <- exportIntegerToAddr i addr 1#
+        cnt <- exportIntegerToAddr i addr 1# -- 1# for big-endian (use 0# for little-endian)
         return ()
+
+{-
+getBigNumLE :: BS.ByteString -> Integer
+getBigNumLE bytes = unsafeDupablePerformIO $
+    let (fptr,offset,len) = BS.toForeignPtr bytes
+    in withForeignPtr fptr $ \ptr -> do
+        let Ptr addr = ptr `plusPtr` offset :: Ptr Word64
+            I# n = len
+        importIntegerFromAddr addr (int2Word# n) 0#
+
+-- little-endian
+integerToLE :: Integer -> BS.ByteString
+integerToLE i = BS.unsafeCreate (I# (word2Int# (sizeInBaseInteger i 256#))) $ \ptr -> do
+        let Ptr addr = ptr
+        cnt <- exportIntegerToAddr i addr 0#
+        return ()
+-}