Merge pull request #31 from haskell-cryptography/prepare-3.0.1.0

Prepare 3.0.1.0

Author: Kleidukos

.github/workflows/linting.yml

@@ -13,7 +13,7 @@ jobs:
 
     - uses: haskell-actions/run-fourmolu@v11
       with:
-        version: "0.14.1.0"
+        version: "0.17.0.0"
         pattern: |
           src/**/*.hs
           test/**/*.hs
@@ -26,7 +26,7 @@ jobs:
     - name: 'Set up HLint'
       uses: haskell-actions/hlint-setup@v2
       with:
-        version: '3.8'
+        version: '3.10'
 
     - name: 'Run HLint'
       uses: haskell-actions/hlint-run@v2

.github/workflows/one-time-password.yml

@@ -30,23 +30,34 @@ jobs:
     steps:
       - name: Checkout base repo
         uses: actions/checkout@v4
+
       - name: Set up Haskell
         id: setup-haskell
         uses: haskell-actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: 'latest'
+
       - name: Configure
         run: | 
           ./.github/workflows/install-libsodium.sh
           cabal freeze
+
       - name: Cache
         uses: actions/cache@v4
         with:
           path: ${{ steps.setup-haskell.outputs.cabal-store }}
           key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('**/plan.json') }}
           restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}-
-      - name: Build
-        run: cabal build
-      - name: Test
-        run: cabal test
+
+      - name: Test with homebrew on macOS
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          cabal build --project-file=cabal.homebrew.project -v2 all
+          cabal test --project-file=cabal.homebrew.project all
+
+      - name: Test with pkg-config
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          cabal build --project-file=cabal.pkg-config.project -v2 all
+          cabal test --project-file=cabal.pkg-config.project all

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 3.0.1.0 — 20-05-2025
+* Support latest versions of `text`, `text-display` and `sel`
+
 ## 3.0.0.0 — 13-04-2024
 
 * The library has been transferred to the Haskell Cryptography Group's stewardship;

cabal.homebrew.project

@@ -0,0 +1,4 @@
+import: ./cabal.project
+
+package libsodium-bindings
+  flags: +homebrew -pkg-config

cabal.pkg-config.project

@@ -0,0 +1,5 @@
+import: ./cabal.project
+
+package libsodium-bindings
+  flags: -homebrew +pkg-config
+

cabal.project

@@ -10,11 +10,3 @@ package *
   documentation: true
 
 test-show-details: direct
-
-source-repository-package
-    type: git
-    location: https://github.com/haskell-cryptography/libsodium-bindings
-    tag: 1d86e29a6819bd65df89c5885ce0cf941b6f7012
-    subdir:
-        ./libsodium-bindings
-        ./sel

one-time-password.cabal

@@ -20,11 +20,13 @@ category:           Cryptography
 build-type:         Simple
 extra-source-files: README.md
 extra-doc-files:    CHANGELOG.md
-tested-with:        GHC ==9.4.8 || ==9.6.4 || ==9.8.2
+tested-with:
+  GHC ==9.4.8 || ==9.6.4 || ==9.6.7 || ==9.8.2 || ==9.8.4 || ==9.10.2
 
 source-repository head
   type:     git
-  location: git://github.com/haskell-cryptography/one-time-password.git
+  location:
+    https://github.com/haskell-cryptography/one-time-password.git
 
 common ghc-options
   ghc-options:
@@ -48,16 +50,16 @@ library
     OTP.TOTP
 
   build-depends:
-    , base             >=4.17   && <5
-    , bytestring       ^>=0.12
-    , cereal           ^>=0.5
-    , chronos          ^>=1.1.6
-    , cryptohash-sha1  ^>=0.11
-    , network-uri      ^>=2.6
-    , sel              >=0.1.0.0
-    , text             >=2.0
-    , text-display     ^>=1.0
-    , text-builder-linear >=0.1
+    , base                 >=4.17   && <5
+    , bytestring           ^>=0.12
+    , cereal               ^>=0.5
+    , chronos              ^>=1.1.6
+    , cryptohash-sha1      ^>=0.11
+    , network-uri          ^>=2.6
+    , sel                  ^>=0.1
+    , text                 >=2.0
+    , text-builder-linear  >=0.1
+    , text-display         ^>=1.0
 
   ghc-options:     -Wall
 
@@ -128,5 +130,5 @@ executable one-time-password
     , torsor                ^>=0.1
 
   other-modules:      Paths_one_time_password
-  autogen-modules:      Paths_one_time_password
+  autogen-modules:    Paths_one_time_password
   ghc-options:        -Wall

src/OTP/Commons.hs

@@ -15,8 +15,8 @@ module OTP.Commons
 
 import Chronos (Time (..), Timespan (..), asSeconds, sinceEpoch)
 import Data.Int (Int64)
-import Data.Text.Display
 import Data.Text.Builder.Linear (Builder)
+import Data.Text.Display
 import Data.Word
 import Text.Printf (printf)
 

src/OTP/HOTP.hs

@@ -101,13 +101,13 @@ hotpSHA256
   -- ^ Number of digits in a password. MUST be 6 digits at a minimum, and possibly 7 and 8 digits.
   -> OTP
   -- ^ HOTP
-hotpSHA256 key counter digits' = unsafePerformIO $ do
+hotpSHA256 key counter digits' =
   let digits = digitsToWord32 digits'
-  let msg = runPut $ putWord64be counter
-  hash <- SHA256.authenticationTagToBinary <$> SHA256.authenticate msg key
-  let code = truncateHash $ BS.unpack hash
-  let result = code `rem` (10 ^ digits)
-  pure $ OTP digits result
+      msg = runPut $ putWord64be counter
+      hash = SHA256.authenticationTagToBinary $ SHA256.authenticate msg key
+      code = truncateHash $ BS.unpack hash
+      result = code `rem` (10 ^ digits)
+   in OTP digits result
 
 -- | Check presented password against a valid range.
 --
@@ -150,13 +150,13 @@ hotpSHA512
   -- ^ Number of digits in a password
   -> OTP
   -- ^ HOTP
-hotpSHA512 key counter digits' = unsafePerformIO $ do
+hotpSHA512 key counter digits' =
   let digits = digitsToWord32 digits'
-  let msg = runPut $ putWord64be counter
-  hash <- SHA512.authenticationTagToBinary <$> SHA512.authenticate msg key
-  let code = truncateHash $ BS.unpack hash
-  let result = code `rem` (10 ^ digits)
-  pure $ OTP digits result
+      msg = runPut $ putWord64be counter
+      hash = SHA512.authenticationTagToBinary $ SHA512.authenticate msg key
+      code = truncateHash $ BS.unpack hash
+      result = code `rem` (10 ^ digits)
+   in OTP digits result
 
 -- |
 --