From 0bd991ee65c95c67fbfde5a77d4f9144c74d00bb Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Tue, 10 Mar 2026 19:32:16 +0900 Subject: [PATCH 1/6] adding the ci branch to run CI --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e27d2fc..3922d74e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,6 +8,7 @@ on: push: branches: - master + - ci pull_request: branches: - master From be9b9c44b4eac65dba5c8803e018c295178392df Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Tue, 10 Mar 2026 19:40:54 +0900 Subject: [PATCH 2/6] using time-manager v0.2 --- http-conduit/http-conduit.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/http-conduit/http-conduit.cabal b/http-conduit/http-conduit.cabal index 8062b4da..32cd93a4 100644 --- a/http-conduit/http-conduit.cabal +++ b/http-conduit/http-conduit.cabal @@ -68,6 +68,7 @@ test-suite test , warp-tls , tls < 1.5 || >= 1.5.2 , time + , time-manager < 0.3 , blaze-builder , bytestring , text From dc2b00e643256ac5ae7ce87e0ae076301e72b5b1 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Thu, 5 Mar 2026 18:40:17 +0000 Subject: [PATCH 3/6] Use cryptohash-md5, nor crypton & memory, for MD5 hashes Also bumps Stack GHC 9.10 snapshot to LTS-24.33 (latest). --- http-client-tls/ChangeLog.md | 5 +++++ http-client-tls/Network/HTTP/Client/TLS.hs | 7 ++++--- http-client-tls/http-client-tls.cabal | 6 +++--- stack.yaml | 2 +- stack.yaml.lock | 12 ++++++++++++ 5 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 stack.yaml.lock diff --git a/http-client-tls/ChangeLog.md b/http-client-tls/ChangeLog.md index 5eeb923d..08116771 100644 --- a/http-client-tls/ChangeLog.md +++ b/http-client-tls/ChangeLog.md @@ -1,5 +1,10 @@ # Changelog for http-client-tls +## 0.3.6.5 + +* For MD5 hashes in Base16 format, depend on packages `cryptohash-md5` and + `base16` rather than `crypton` and `memory` (the latter is unmaintained). + ## 0.3.6.4 * data-default-class -> data-default [#546](https://github.com/snoyberg/http-client/pull/546/files) diff --git a/http-client-tls/Network/HTTP/Client/TLS.hs b/http-client-tls/Network/HTTP/Client/TLS.hs index e0103335..965d3fda 100644 --- a/http-client-tls/Network/HTTP/Client/TLS.hs +++ b/http-client-tls/Network/HTTP/Client/TLS.hs @@ -41,9 +41,10 @@ import Control.Monad (guard, unless) import qualified Data.CaseInsensitive as CI import Data.Maybe (fromMaybe, isJust) import Network.HTTP.Types (status401) -import Crypto.Hash (hash, Digest, MD5) +import qualified Crypto.Hash.MD5 as MD5 import Control.Arrow ((***)) -import Data.ByteArray.Encoding (convertToBase, Base (Base16)) +import Data.Base16.Types (extractBase16) +import Data.ByteString.Base16 (encodeBase16') import Data.Typeable (Typeable) import Control.Monad.Catch (MonadThrow, throwM) import qualified Data.Map as Map @@ -361,7 +362,7 @@ applyDigestAuth user pass req0 man = liftIO $ do -- we always use no qop or qop=auth ha2 = md5 $ S.concat [method req, ":", path req] - md5 bs = convertToBase Base16 (hash bs :: Digest MD5) + md5 = extractBase16 . encodeBase16' . MD5.hash key = "Authorization" val = S.concat [ "Digest username=\"" diff --git a/http-client-tls/http-client-tls.cabal b/http-client-tls/http-client-tls.cabal index f8f1a94c..2e2808ab 100644 --- a/http-client-tls/http-client-tls.cabal +++ b/http-client-tls/http-client-tls.cabal @@ -1,5 +1,5 @@ name: http-client-tls -version: 0.3.6.4 +version: 0.3.6.5 synopsis: http-client backend using the connection package and tls library description: Hackage documentation generation is not reliable. For up to date documentation, please see: . homepage: https://github.com/snoyberg/http-client @@ -17,6 +17,8 @@ library exposed-modules: Network.HTTP.Client.TLS other-extensions: ScopedTypeVariables build-depends: base >= 4.10 && < 5 + , base16 + , cryptohash-md5 , data-default , http-client >= 0.7.11 , crypton-connection @@ -26,8 +28,6 @@ library , case-insensitive , transformers , http-types - , crypton - , memory , exceptions , containers , text diff --git a/stack.yaml b/stack.yaml index f17a8879..88a9d5ee 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2025-03-20 +snapshot: lts-24.33 # GHC 9.10.3 packages: - http-client - http-client-tls diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 00000000..a8f2d2f2 --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/topics/lock_files + +packages: [] +snapshots: +- completed: + sha256: a8cfaae441160430cdde558cb80d4f9d60746e7417b275250e4e0af57ee14f36 + size: 728954 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/33.yaml + original: lts-24.33 From d37a9cdeca901b2be6106068f65024c101f4f75d Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Tue, 10 Mar 2026 21:04:36 +0900 Subject: [PATCH 4/6] removing stack.yaml.lock --- stack.yaml.lock | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 stack.yaml.lock diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index a8f2d2f2..00000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,12 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/topics/lock_files - -packages: [] -snapshots: -- completed: - sha256: a8cfaae441160430cdde558cb80d4f9d60746e7417b275250e4e0af57ee14f36 - size: 728954 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/33.yaml - original: lts-24.33 From afc0114989b778cbcd2cfbc7f88d361142a14e40 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Wed, 11 Mar 2026 11:37:01 +0900 Subject: [PATCH 5/6] using base16 >= 1.0 --- http-client-tls/http-client-tls.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http-client-tls/http-client-tls.cabal b/http-client-tls/http-client-tls.cabal index 2e2808ab..05a22ada 100644 --- a/http-client-tls/http-client-tls.cabal +++ b/http-client-tls/http-client-tls.cabal @@ -17,7 +17,7 @@ library exposed-modules: Network.HTTP.Client.TLS other-extensions: ScopedTypeVariables build-depends: base >= 4.10 && < 5 - , base16 + , base16 >= 1.0 , cryptohash-md5 , data-default , http-client >= 0.7.11 From ef4d747139fdd4d8418f3ecf9a5cc1b329800269 Mon Sep 17 00:00:00 2001 From: Kazu Yamamoto Date: Wed, 11 Mar 2026 12:23:02 +0900 Subject: [PATCH 6/6] http-client-tls: ver bumps up --- http-client-tls/ChangeLog.md | 2 +- http-client-tls/http-client-tls.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/http-client-tls/ChangeLog.md b/http-client-tls/ChangeLog.md index 08116771..6fc694d8 100644 --- a/http-client-tls/ChangeLog.md +++ b/http-client-tls/ChangeLog.md @@ -1,6 +1,6 @@ # Changelog for http-client-tls -## 0.3.6.5 +## 0.4.0 * For MD5 hashes in Base16 format, depend on packages `cryptohash-md5` and `base16` rather than `crypton` and `memory` (the latter is unmaintained). diff --git a/http-client-tls/http-client-tls.cabal b/http-client-tls/http-client-tls.cabal index 05a22ada..e80136f5 100644 --- a/http-client-tls/http-client-tls.cabal +++ b/http-client-tls/http-client-tls.cabal @@ -1,5 +1,5 @@ name: http-client-tls -version: 0.3.6.5 +version: 0.4.0 synopsis: http-client backend using the connection package and tls library description: Hackage documentation generation is not reliable. For up to date documentation, please see: . homepage: https://github.com/snoyberg/http-client