Skip to content
Commits on Source (4)
Description: actually use the aligned buffer when required
Upstream implemented a fix for issue 108, but didn't actually use the
aligned buffer in place of the unaligned data. This worked fine everywhere
except our armhf buildds, since other archs don't actually raise SIGBUS on
unaligned access.
Author: Steve Langasek <steve.langasek@ubuntu.com>
Bug-Upstream: https://github.com/haskell-crypto/cryptonite/issues/108
Bug-Debian: https://bugs.debian.org/841983
Forwarded-Upstream: yes
--- a/cbits/cryptonite_sha3.c
+++ b/cbits/cryptonite_sha3.c
@@ -135,8 +135,8 @@ void cryptonite_sha3_update(struct sha3_
uint64_t tramp[SHA3_BUF_SIZE_MAX/8];
ASSERT_ALIGNMENT(tramp, 8);
for (; len >= ctx->bufsz; len -= ctx->bufsz, data += ctx->bufsz) {
- memcpy(tramp, data, ctx->bufsz / 8);
- sha3_do_chunk(ctx->state, (uint64_t *) data, ctx->bufsz / 8);
+ memcpy(tramp, data, ctx->bufsz);
+ sha3_do_chunk(ctx->state, tramp, ctx->bufsz / 8);
}
} else {
/* process as much ctx->bufsz-block */
crypto-buffer-alignment.patch
more-alignment.patch
--- a/dns.cabal
+++ b/dns.cabal
@@ -65,7 +65,6 @@ Test-Suite network
Build-Depends: dns
, base
, bytestring
- , bytestring-builder
, hspec
Test-Suite spec
@@ -80,7 +79,6 @@ Test-Suite spec
, attoparsec
, binary
, bytestring
- , bytestring-builder
, conduit >= 1.1
, conduit-extra >= 1.1
, containers
--- a/either.cabal
+++ b/either.cabal
@@ -32,9 +32,9 @@
exceptions >= 0.5 && < 0.9,
free >= 4.9 && < 5,
monad-control >= 0.3.2 && < 1.1,
- MonadRandom >= 0.1 && < 0.5,
+ MonadRandom >= 0.1 && < 0.6,
mtl >= 2.0 && < 2.3,
- mmorph >= 1.0.0 && < 1.1,
+ mmorph >= 1.0.0 && < 1.2,
profunctors >= 4 && < 6,
semigroups >= 0.8.3.1 && < 1,
semigroupoids >= 4 && < 6,
......@@ -6,9 +6,9 @@ Author: Ilias Tsitsimpis <iliastsi@debian.org>
--- a/email-validate.cabal
+++ b/email-validate.cabal
@@ -21,6 +21,10 @@ source-repository this
@@ -21,6 +21,10 @@
location: git://github.com/Porges/email-validate-hs.git
tag: v2.3.2
tag: v2.3.2.5
+flag test-doctests
+ description: Enable/Disable the doctest suite
......@@ -17,7 +17,7 @@ Author: Ilias Tsitsimpis <iliastsi@debian.org>
library
build-depends:
base >= 4.4 && < 5,
@@ -50,6 +54,8 @@ test-suite Main
@@ -50,6 +54,8 @@
test-suite doctests
type: exitcode-stdio-1.0
......