main..2168d2a · typeable/entropy

git.iko.soy/typeable/entropy

on 2168d2a help sign in

.github/workflows/haskell-ci.ymldeleted−264

since splitsnapshots

unifiedsplit

@@ -1,264 +0,0 @@

1−# This GitHub workflow config has been generated by a script via

2−#

3−# haskell-ci 'github' 'entropy.cabal'

4−#

5−# To regenerate the script (for example after adjusting tested-with) run

6−#

7−# haskell-ci regenerate

8−#

9−# For more information, see https://github.com/andreasabel/haskell-ci

10−#

11−# version: 0.19.20241219

12−#

13−# REGENDATA ("0.19.20241219",["github","entropy.cabal"])

14−#

15−name: Haskell-CI

16−on:

17− push:

18− branches:

19− - main

20− pull_request:

21− branches:

22− - main

23−jobs:

24− linux:

25− name: Haskell-CI - Linux - ${{ matrix.compiler }}

26− runs-on: ubuntu-20.04

27− timeout-minutes:

28− 60

29− container:

30− image: buildpack-deps:jammy

31− continue-on-error: ${{ matrix.allow-failure }}

32− strategy:

33− matrix:

34− include:

35− - compiler: ghc-9.12.1

36− compilerKind: ghc

37− compilerVersion: 9.12.1

38− setup-method: ghcup

39− allow-failure: false

40− - compiler: ghc-9.10.1

41− compilerKind: ghc

42− compilerVersion: 9.10.1

43− setup-method: ghcup

44− allow-failure: false

45− - compiler: ghc-9.8.4

46− compilerKind: ghc

47− compilerVersion: 9.8.4

48− setup-method: ghcup

49− allow-failure: false

50− - compiler: ghc-9.6.6

51− compilerKind: ghc

52− compilerVersion: 9.6.6

53− setup-method: ghcup

54− allow-failure: false

55− - compiler: ghc-9.4.8

56− compilerKind: ghc

57− compilerVersion: 9.4.8

58− setup-method: ghcup

59− allow-failure: false

60− - compiler: ghc-9.2.8

61− compilerKind: ghc

62− compilerVersion: 9.2.8

63− setup-method: ghcup

64− allow-failure: false

65− - compiler: ghc-9.0.2

66− compilerKind: ghc

67− compilerVersion: 9.0.2

68− setup-method: ghcup

69− allow-failure: false

70− - compiler: ghc-8.10.7

71− compilerKind: ghc

72− compilerVersion: 8.10.7

73− setup-method: ghcup

74− allow-failure: false

75− - compiler: ghc-8.8.4

76− compilerKind: ghc

77− compilerVersion: 8.8.4

78− setup-method: ghcup

79− allow-failure: false

80− - compiler: ghc-8.6.5

81− compilerKind: ghc

82− compilerVersion: 8.6.5

83− setup-method: ghcup

84− allow-failure: false

85− - compiler: ghc-8.4.4

86− compilerKind: ghc

87− compilerVersion: 8.4.4

88− setup-method: ghcup

89− allow-failure: false

90− - compiler: ghc-8.2.2

91− compilerKind: ghc

92− compilerVersion: 8.2.2

93− setup-method: ghcup

94− allow-failure: false

95− fail-fast: false

96− steps:

97− - name: apt-get install

98− run: |

99− apt-get update

100− apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev

101− - name: Install GHCup

102− run: |

103− mkdir -p "$HOME/.ghcup/bin"

104− curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"

105− chmod a+x "$HOME/.ghcup/bin/ghcup"

106− - name: Install cabal-install (prerelease)

107− run: |

108− "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;

109− "$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)

110− echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"

111− - name: Install GHC (GHCup)

112− if: matrix.setup-method == 'ghcup'

113− run: |

114− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

115− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")

116− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')

117− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')

118− echo "HC=$HC" >> "$GITHUB_ENV"

119− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"

120− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"

121− env:

122− HCKIND: ${{ matrix.compilerKind }}

123− HCNAME: ${{ matrix.compiler }}

124− HCVER: ${{ matrix.compilerVersion }}

125− - name: Set PATH and environment variables

126− run: |

127− echo "$HOME/.cabal/bin" >> $GITHUB_PATH

128− echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

129− echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

130− echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

131− HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

132− echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

133− echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

134− echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

135− if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi

136− echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

137− env:

138− HCKIND: ${{ matrix.compilerKind }}

139− HCNAME: ${{ matrix.compiler }}

140− HCVER: ${{ matrix.compilerVersion }}

141− - name: env

142− run: |

143− env

144− - name: write cabal config

145− run: |

146− mkdir -p $CABAL_DIR

147− cat >> $CABAL_CONFIG <<EOF

148− remote-build-reporting: anonymous

149− write-ghc-environment-files: never

150− remote-repo-cache: $CABAL_DIR/packages

151− logs-dir: $CABAL_DIR/logs

152− world-file: $CABAL_DIR/world

153− extra-prog-path: $CABAL_DIR/bin

154− symlink-bindir: $CABAL_DIR/bin

155− installdir: $CABAL_DIR/bin

156− build-summary: $CABAL_DIR/logs/build.log

157− store-dir: $CABAL_DIR/store

158− install-dirs user

159− prefix: $CABAL_DIR

160− repository hackage.haskell.org

161− url: http://hackage.haskell.org/

162− EOF

163− if $HEADHACKAGE; then

164− cat >> $CABAL_CONFIG <<EOF

165− repository head.hackage.ghc.haskell.org

166− url: https://ghc.gitlab.haskell.org/head.hackage/

167− secure: True

168− root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d

169− 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329

170− f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89

171− key-threshold: 3

172− active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override

173− EOF

174− fi

175− cat >> $CABAL_CONFIG <<EOF

176− program-default-options

177− ghc-options: $GHCJOBS +RTS -M3G -RTS

178− EOF

179− cat $CABAL_CONFIG

180− - name: versions

181− run: |

182− $HC --version || true

183− $HC --print-project-git-commit-id || true

184− $CABAL --version || true

185− - name: update cabal index

186− run: |

187− $CABAL v2-update -v

188− - name: install cabal-plan

189− run: |

190− mkdir -p $HOME/.cabal/bin

191− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz

192− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -

193− xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan

194− rm -f cabal-plan.xz

195− chmod a+x $HOME/.cabal/bin/cabal-plan

196− cabal-plan --version

197− - name: checkout

198− uses: actions/checkout@v4

199− with:

200− path: source

201− - name: initial cabal.project for sdist

202− run: |

203− touch cabal.project

204− echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project

205− cat cabal.project

206− - name: sdist

207− run: |

208− mkdir -p sdist

209− $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist

210− - name: unpack

211− run: |

212− mkdir -p unpacked

213− find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;

214− - name: generate cabal.project

215− run: |

216− PKGDIR_entropy="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/entropy-[0-9.]*')"

217− echo "PKGDIR_entropy=${PKGDIR_entropy}" >> "$GITHUB_ENV"

218− rm -f cabal.project cabal.project.local

219− touch cabal.project

220− touch cabal.project.local

221− echo "packages: ${PKGDIR_entropy}" >> cabal.project

222− echo "package entropy" >> cabal.project

223− echo " ghc-options: -Werror=missing-methods" >> cabal.project

224− cat >> cabal.project <<EOF

225− EOF

226− if $HEADHACKAGE; then

227− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project

228− fi

229− $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(entropy)$/; }' >> cabal.project.local

230− cat cabal.project

231− cat cabal.project.local

232− - name: dump install plan

233− run: |

234− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all

235− cabal-plan

236− - name: restore cache

237− uses: actions/cache/restore@v4

238− with:

239− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

240− path: ~/.cabal/store

241− restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-

242− - name: install dependencies

243− run: |

244− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

245− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all

246− - name: build w/o tests

247− run: |

248− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all

249− - name: build

250− run: |

251− $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always

252− - name: haddock

253− run: |

254− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

255− - name: unconstrained build

256− run: |

257− rm -f cabal.project.local

258− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all

259− - name: save cache

260− if: always()

261− uses: actions/cache/save@v4

262− with:

263− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

264− path: ~/.cabal/store

.travis.ymlnew file+6

@@ -0,0 +1,6 @@

1+language: haskell

2+ghc:

3+ - 8.6

4+ - 8.4

5+ - 8.2

6+ - 8.0

Setup.hs+1−4

@@ -106,10 +106,7 @@ checkGetentropy cc lbi = do

106 where cArgs = ["-DHAVE_GETENTROPY"]

107

108myRawSystemExitCode :: Verbosity -> FilePath -> [String] -> IO ExitCode

109−#if MIN_VERSION_Cabal(3,14,0)

110−myRawSystemExitCode verbosity program arguments =

111− rawSystemExitCode verbosity Nothing program arguments Nothing

112−#elif __GLASGOW_HASKELL__ >= 704

109+#if __GLASGOW_HASKELL__ >= 704

113-- We know for sure, that if GHC >= 7.4 implies Cabal >= 1.14

110-- We know for sure, that if GHC >= 7.4 implies Cabal >= 1.14

114myRawSystemExitCode = rawSystemExitCode

111myRawSystemExitCode = rawSystemExitCode

115#else

112#else

System/Entropy.hs+2−2

@@ -36,11 +36,11 @@ import Control.Exception (bracket)

37-- |Get a specific number of bytes of cryptographically

38-- secure random data using the *system-specific* sources.

39−-- (As of 0.4. Versions <0.4 mixed system and hardware sources)

39+-- (As of 0.4. Verions <0.4 mixed system and hardware sources)

40--

41-- The returned random value is considered cryptographically secure but not true entropy.

42--

43−-- On some platforms this requires a file handle which can lead to resource

43+-- On some platforms this requies a file handle which can lead to resource

44-- exhaustion in some situations.

45getEntropy :: Int -- ^ Number of bytes

46 -> IO B.ByteString

System/EntropyGhcjs.hs+3−3

@@ -19,7 +19,7 @@ import Data.ByteString as B

19import GHCJS.DOM.Crypto as Crypto

20import GHCJS.DOM.Types (ArrayBufferView (..), fromJSValUnchecked)

21import GHCJS.DOM.GlobalCrypto (getCrypto)

22−import GHCJS.DOM (globalThisUnchecked)

22+import GHCJS.DOM (currentWindowUnchecked)

23import Language.Javascript.JSaddle.Object as JS

@@ -36,8 +36,8 @@ hardwareRandom _ = pure Nothing

36-- |Open a `CryptHandle`

37openHandle :: IO CryptHandle

38openHandle = do

39− this <- globalThisUnchecked

39+ w <- currentWindowUnchecked

40− CH <$> getCrypto this

40+ CH <$> getCrypto w

42-- |Close the `CryptHandle`

43closeHandle :: CryptHandle -> IO ()

System/EntropyNix.hs+1−5

@@ -34,7 +34,7 @@ import Data.ByteString.Internal as B

34#undef HAVE_RDRAND

35#endif

37−import System.Posix (openFd, closeFd, fdReadBuf, OpenMode(..), defaultFileFlags, Fd, OpenFileFlags(..))

37+import System.Posix (openFd, closeFd, fdReadBuf, OpenMode(..), defaultFileFlags, Fd)

39source :: FilePath

40source = "/dev/urandom"

@@ -75,11 +75,7 @@ openHandle =

75openRandomFile :: IO Fd

76openRandomFile = do

77 evaluate ensurePoolInitialized

78−#if MIN_VERSION_unix(2,8,0)

79− openFd source ReadOnly defaultFileFlags { creat = Nothing }

80−#else

81 openFd source ReadOnly Nothing defaultFileFlags

78 openFd source ReadOnly Nothing defaultFileFlags

82−#endif

84-- |Close the `CryptHandle`

80-- |Close the `CryptHandle`

85closeHandle :: CryptHandle -> IO ()

81closeHandle :: CryptHandle -> IO ()

System/EntropyWindows.hs+15−14

@@ -31,20 +31,21 @@ import Foreign.Marshal.Alloc (alloca)

31import Foreign.Marshal.Utils (toBool)

32import Foreign.Storable (peek)

34−-- C example for windows rng - taken from a blog, can't recall which one but thank you!

34+{- C example for windows rng - taken from a blog, can't recall which one but thank you!

35−-- #include <Windows.h>

35+ #include <Windows.h>

36−-- #include <Wincrypt.h>

36+ #include <Wincrypt.h>

37−-- ...

37+ ...

38−-- //

38+ //

39−-- // DISCLAIMER: Don't forget to check your error codes!!

39+ // DISCLAIMER: Don't forget to check your error codes!!

40−-- // I am not checking as to make the example simple...

40+ // I am not checking as to make the example simple...

41−-- //

41+ //

42−-- HCRYPTPROV hCryptCtx = NULL;

42+ HCRYPTPROV hCryptCtx = NULL;

43−-- BYTE randomArray[128];

43+ BYTE randomArray[128];

44−--

44+

45−-- CryptAcquireContext(&hCryptCtx, NULL, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);

45+ CryptAcquireContext(&hCryptCtx, NULL, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);

46−-- CryptGenRandom(hCryptCtx, 128, randomArray);

46+ CryptGenRandom(hCryptCtx, 128, randomArray);

47−-- CryptReleaseContext(hCryptCtx, 0);

47+ CryptReleaseContext(hCryptCtx, 0);

48+-}

50#ifdef arch_i386

51#ifdef arch_i386

cabal.haskell-cideleted−3

@@ -1,3 +0,0 @@

1−branches: main

2−cabal-check: False

3−haddock: >=8.2

cbits/random_initialized.c−4

@@ -6,14 +6,12 @@

6#include <unistd.h>

8#ifdef HAVE_GETENTROPY

9−#ifndef DO_NOT_USE_GET_ENTROPY

10static int ensure_pool_initialized_getentropy()

9static int ensure_pool_initialized_getentropy()

11{

10{

12 char tmp;

11 char tmp;

13 return getentropy(&tmp, sizeof(tmp));

12 return getentropy(&tmp, sizeof(tmp));

14}

13}

15#endif

14#endif

16−#endif

18// Poll /dev/random to wait for randomness. This is a proxy for the /dev/urandom

16// Poll /dev/random to wait for randomness. This is a proxy for the /dev/urandom

19// pool being initialized.

17// pool being initialized.

@@ -48,10 +46,8 @@ static int ensure_pool_initialized_poll()

48int ensure_pool_initialized()

46int ensure_pool_initialized()

49{

47{

50#ifdef HAVE_GETENTROPY

48#ifdef HAVE_GETENTROPY

51−#ifndef DO_NOT_USE_GET_ENTROPY

52 if (ensure_pool_initialized_getentropy() == 0)

49 if (ensure_pool_initialized_getentropy() == 0)

53 return 0;

50 return 0;

54−#endif

55#endif

51#endif

57 return ensure_pool_initialized_poll();

53 return ensure_pool_initialized_poll();

entropy.cabal+12−36

@@ -1,6 +1,6 @@

1−cabal-version: >=1.10

2name: entropy

1name: entropy

3−version: 0.4.1.11

3+version: 0.4.1.7

4description: A mostly platform independent method to obtain cryptographically strong entropy

5 (RDRAND, urandom, CryptAPI, and patches welcome)

6 Users looking for cryptographically strong (number-theoretically

@@ -18,44 +18,23 @@ stability: stable

19build-type: Custom

21+-- ^^ Test for RDRAND support using 'ghc'

22+cabal-version: >=1.10

21−tested-with:

23+tested-with: GHC == 8.2.2

22− GHC == 9.12.1

24+-- data-files:

23− GHC == 9.10.1

24− GHC == 9.8.4

25− GHC == 9.6.6

26− GHC == 9.4.8

27− GHC == 9.2.8

28− GHC == 9.0.2

29− GHC == 8.10.7

30− GHC == 8.8.4

31− GHC == 8.6.5

32− GHC == 8.4.4

33− GHC == 8.2.2

34−

35−extra-source-files:

36− ./cbits/getrandom.c

37− ./cbits/random_initialized.c

25+extra-source-files: ./cbits/getrandom.c ./cbits/random_initialized.c ./cbits/rdrand.c, ./cbits/rdrand.h, README.md

38− ./cbits/rdrand.c

39− ./cbits/rdrand.h

40− README.md

41−

42−Flag DoNotGetEntropy

43− Description: Avoid use of the getentropy() *nix function. By default getentropy will be used

44− if detected during compilation (this plays poorly with cross compilation).

45− Default: False

46− Manual: True

48custom-setup

27custom-setup

49− setup-depends: Cabal >= 1.10 && < 3.17

28+ setup-depends: Cabal >= 1.10 && < 3.9

50 , base < 5

29 , base < 5

51− , filepath < 1.6

30+ , filepath < 1.5

52 , directory < 1.4

31 , directory < 1.4

53 , process < 1.7

32 , process < 1.7

55library

34library

56 ghc-options: -O2

35 ghc-options: -O2

57 exposed-modules: System.Entropy

36 exposed-modules: System.Entropy

58− if impl(ghcjs) || os(ghcjs) || arch(wasm32)

37+ if impl(ghcjs) || os(ghcjs)

59 other-modules: System.EntropyGhcjs

38 other-modules: System.EntropyGhcjs

60 else {

39 else {

61 if os(windows)

40 if os(windows)

@@ -70,8 +49,8 @@ library

71 default-language: Haskell2010

50 default-language: Haskell2010

73− if impl(ghcjs) || os(ghcjs) || arch(wasm32) {

52+ if impl(ghcjs) || os(ghcjs) {

74− build-depends: ghcjs-dom >= 0.9.5.0 && < 1

53+ build-depends: ghcjs-dom

75 , jsaddle

54 , jsaddle

76 }

55 }

77 else {

56 else {

@@ -93,9 +72,6 @@ library

93 Build-Depends: unix

72 Build-Depends: unix

94 c-sources: cbits/getrandom.c cbits/random_initialized.c

73 c-sources: cbits/getrandom.c cbits/random_initialized.c

95 }

74 }

96− if flag(DoNotGetEntropy) {

97− cc-options: -DDO_NOT_USE_GET_ENTROPY

98− }

100

101source-repository head

77source-repository head