Skip to content

Commit 13f4895

Browse files
mbgmbg
committed
Use crypton-* packages
1 parent 98461e4 commit 13f4895

14 files changed

+207
-20
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog for `wai-saml2`
22

3+
## Unreleased
4+
5+
- Switch from `x509-*` to `crypton-x509-*`.
6+
37
## 0.4
48

59
- Split `validateResponse` into `decodeResponse` and `validateSAMLResponse` ([#31](https://github.com/mbg/wai-saml2/pull/31) by [@fumieval](https://github.com/fumieval))

‎package.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies:
2828
- bytestring >= 0.9 && < 0.12
2929
- c14n >= 0.1.0.1 && < 1
3030
- containers >= 0.6 && <0.7
31-
- cryptonite < 1
31+
- crypton < 1
3232
- data-default-class < 1
3333
- http-types < 1
3434
- mtl >= 2.2.1 && < 3
@@ -38,8 +38,8 @@ dependencies:
3838
- vault >= 0.3 && < 1
3939
- wai >= 3.0 && < 4
4040
- wai-extra >= 3.0 && < 4
41-
- x509 < 2
42-
- x509-store < 2
41+
- crypton-x509 < 2
42+
- crypton-x509-store < 2
4343
- xml-conduit < 2
4444
- zlib >= 0.6.0.0 && < 0.7
4545

‎stack-lts-16.1.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
resolver: lts-16.1
22
packages:
3-
- .
3+
- .
44

55
extra-deps:
6-
- c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
6+
- c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
7+
- crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
8+
- crypton-x509-1.7.6
9+
- crypton-x509-store-1.6.9

‎stack-lts-16.1.yaml.lock

+23-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,34 @@ packages:
77
- completed:
88
hackage: c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
99
pantry-tree:
10-
size: 285
1110
sha256: 67187305166a25d10cb133378ae89c3d76d51ee756edd757a84f71f176eb61e7
11+
size: 285
1212
original:
1313
hackage: c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
14+
- completed:
15+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
16+
pantry-tree:
17+
sha256: 0d73be1794796e4c87e1a20198109ec7364eee8c54dd6cf6c4d202f1f6ca3ac0
18+
size: 23320
19+
original:
20+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
21+
- completed:
22+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
23+
pantry-tree:
24+
sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb
25+
size: 1080
26+
original:
27+
hackage: crypton-x509-1.7.6
28+
- completed:
29+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
30+
pantry-tree:
31+
sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3
32+
size: 406
33+
original:
34+
hackage: crypton-x509-store-1.6.9
1435
snapshots:
1536
- completed:
37+
sha256: 954b6b14b0c8130732cf4773f7ebb4efc9a44600d1a5265d142868bf93462bc6
1638
size: 531237
1739
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/1.yaml
18-
sha256: 954b6b14b0c8130732cf4773f7ebb4efc9a44600d1a5265d142868bf93462bc6
1940
original: lts-16.1

‎stack-lts-17.14.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
resolver: lts-17.14
22
compiler: ghc-8.10.7
33
packages:
4-
- .
4+
- .
55

66
extra-deps:
7-
- c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
7+
- c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
8+
- crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
9+
- crypton-x509-1.7.6
10+
- crypton-x509-store-1.6.9

‎stack-lts-17.14.yaml.lock

+23-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,34 @@ packages:
77
- completed:
88
hackage: c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
99
pantry-tree:
10-
size: 285
1110
sha256: 67187305166a25d10cb133378ae89c3d76d51ee756edd757a84f71f176eb61e7
11+
size: 285
1212
original:
1313
hackage: c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
14+
- completed:
15+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
16+
pantry-tree:
17+
sha256: 0d73be1794796e4c87e1a20198109ec7364eee8c54dd6cf6c4d202f1f6ca3ac0
18+
size: 23320
19+
original:
20+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
21+
- completed:
22+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
23+
pantry-tree:
24+
sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb
25+
size: 1080
26+
original:
27+
hackage: crypton-x509-1.7.6
28+
- completed:
29+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
30+
pantry-tree:
31+
sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3
32+
size: 406
33+
original:
34+
hackage: crypton-x509-store-1.6.9
1435
snapshots:
1536
- completed:
37+
sha256: 3740f22286bf5e6e3d82f88125e1c708b6e27847211f956b530aa5d83cf39383
1638
size: 567677
1739
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/14.yaml
18-
sha256: 3740f22286bf5e6e3d82f88125e1c708b6e27847211f956b530aa5d83cf39383
1940
original: lts-17.14

‎stack-lts-18.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
resolver: lts-18.28
2+
3+
extra-deps:
4+
- crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
5+
- crypton-x509-1.7.6
6+
- crypton-x509-store-1.6.9

‎stack-lts-18.yaml.lock

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This file was autogenerated by Stack.
2+
# You should not edit this file by hand.
3+
# For more information, please see the documentation at:
4+
# https://docs.haskellstack.org/en/stable/lock_files
5+
6+
packages:
7+
- completed:
8+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
9+
pantry-tree:
10+
sha256: 0d73be1794796e4c87e1a20198109ec7364eee8c54dd6cf6c4d202f1f6ca3ac0
11+
size: 23320
12+
original:
13+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
14+
- completed:
15+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
16+
pantry-tree:
17+
sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb
18+
size: 1080
19+
original:
20+
hackage: crypton-x509-1.7.6
21+
- completed:
22+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
23+
pantry-tree:
24+
sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3
25+
size: 406
26+
original:
27+
hackage: crypton-x509-store-1.6.9
28+
snapshots:
29+
- completed:
30+
sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68
31+
size: 590100
32+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml
33+
original: lts-18.28

‎stack-lts-19.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
resolver: lts-19.33
2+
3+
extra-deps:
4+
- crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
5+
- crypton-x509-1.7.6
6+
- crypton-x509-store-1.6.9

‎stack-lts-19.yaml.lock

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This file was autogenerated by Stack.
2+
# You should not edit this file by hand.
3+
# For more information, please see the documentation at:
4+
# https://docs.haskellstack.org/en/stable/lock_files
5+
6+
packages:
7+
- completed:
8+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
9+
pantry-tree:
10+
sha256: 0d73be1794796e4c87e1a20198109ec7364eee8c54dd6cf6c4d202f1f6ca3ac0
11+
size: 23320
12+
original:
13+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
14+
- completed:
15+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
16+
pantry-tree:
17+
sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb
18+
size: 1080
19+
original:
20+
hackage: crypton-x509-1.7.6
21+
- completed:
22+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
23+
pantry-tree:
24+
sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3
25+
size: 406
26+
original:
27+
hackage: crypton-x509-store-1.6.9
28+
snapshots:
29+
- completed:
30+
sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4
31+
size: 619204
32+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml
33+
original: lts-19.33

‎stack-lts-20.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
resolver: lts-20.2
1+
resolver: lts-20.25
2+
3+
extra-deps:
4+
- crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
5+
- crypton-x509-1.7.6
6+
- crypton-x509-store-1.6.9

‎stack-lts-20.yaml.lock

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This file was autogenerated by Stack.
2+
# You should not edit this file by hand.
3+
# For more information, please see the documentation at:
4+
# https://docs.haskellstack.org/en/stable/lock_files
5+
6+
packages:
7+
- completed:
8+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
9+
pantry-tree:
10+
sha256: 0d73be1794796e4c87e1a20198109ec7364eee8c54dd6cf6c4d202f1f6ca3ac0
11+
size: 23320
12+
original:
13+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
14+
- completed:
15+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
16+
pantry-tree:
17+
sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb
18+
size: 1080
19+
original:
20+
hackage: crypton-x509-1.7.6
21+
- completed:
22+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
23+
pantry-tree:
24+
sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3
25+
size: 406
26+
original:
27+
hackage: crypton-x509-store-1.6.9
28+
snapshots:
29+
- completed:
30+
sha256: e63b43d506918278d05cd1448bd19352ab2faa9b8e9d64ce527b56f1a7fba149
31+
size: 650255
32+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/25.yaml
33+
original: lts-20.25

‎stack.yaml.lock

+23-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,34 @@ packages:
77
- completed:
88
hackage: c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
99
pantry-tree:
10-
size: 285
1110
sha256: 67187305166a25d10cb133378ae89c3d76d51ee756edd757a84f71f176eb61e7
11+
size: 285
1212
original:
1313
hackage: c14n-0.1.0.1@sha256:c56a513c1363d126ee704656b59d2e2af1cfe878587a97cb69ab0122b82e2d4d,1371
14+
- completed:
15+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
16+
pantry-tree:
17+
sha256: 0d73be1794796e4c87e1a20198109ec7364eee8c54dd6cf6c4d202f1f6ca3ac0
18+
size: 23320
19+
original:
20+
hackage: crypton-0.31@sha256:c0e4aa081bd65d1cb415358ec43e83e7fe703c83b633243a89162bd6eb865850,18286
21+
- completed:
22+
hackage: crypton-x509-1.7.6@sha256:c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281,2339
23+
pantry-tree:
24+
sha256: 729e7db8dfc0a8b43e08bbd8d1387c9065e39beda6ac39e0fb9f10140810a3eb
25+
size: 1080
26+
original:
27+
hackage: crypton-x509-1.7.6
28+
- completed:
29+
hackage: crypton-x509-store-1.6.9@sha256:422b9b9f87a7382c66385d047615b16fc86a68c08ea22b1e0117c143a2d44050,1750
30+
pantry-tree:
31+
sha256: 87654d130a7f987ee139c821a1be45736d18df9fa4cb1142c4e054d3802338f3
32+
size: 406
33+
original:
34+
hackage: crypton-x509-store-1.6.9
1435
snapshots:
1536
- completed:
37+
sha256: 3740f22286bf5e6e3d82f88125e1c708b6e27847211f956b530aa5d83cf39383
1638
size: 567677
1739
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/14.yaml
18-
sha256: 3740f22286bf5e6e3d82f88125e1c708b6e27847211f956b530aa5d83cf39383
1940
original: lts-17.14

‎wai-saml2.cabal

+6-6
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ library
6868
, bytestring >=0.9 && <0.12
6969
, c14n >=0.1.0.1 && <1
7070
, containers ==0.6.*
71-
, cryptonite <1
71+
, crypton <1
72+
, crypton-x509 <2
73+
, crypton-x509-store <2
7274
, data-default-class <1
7375
, http-types <1
7476
, mtl >=2.2.1 && <3
@@ -78,8 +80,6 @@ library
7880
, vault >=0.3 && <1
7981
, wai >=3.0 && <4
8082
, wai-extra >=3.0 && <4
81-
, x509 <2
82-
, x509-store <2
8383
, xml-conduit <2
8484
, zlib >=0.6.0.0 && <0.7
8585
default-language: Haskell2010
@@ -103,7 +103,9 @@ test-suite parser
103103
, bytestring
104104
, c14n >=0.1.0.1 && <1
105105
, containers ==0.6.*
106-
, cryptonite <1
106+
, crypton <1
107+
, crypton-x509 <2
108+
, crypton-x509-store <2
107109
, data-default-class <1
108110
, filepath
109111
, http-types <1
@@ -118,8 +120,6 @@ test-suite parser
118120
, wai >=3.0 && <4
119121
, wai-extra >=3.0 && <4
120122
, wai-saml2
121-
, x509 <2
122-
, x509-store <2
123123
, xml-conduit
124124
, zlib >=0.6.0.0 && <0.7
125125
default-language: Haskell2010

0 commit comments

Comments
 (0)