Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vincent Hanquez 2014-07-17 16:55:52 +01:00
commit f8444e3564
5 changed files with 33 additions and 1 deletions

26
.travis.yml Normal file
View File

@ -0,0 +1,26 @@
env:
- GHCVER=7.4.2
- GHCVER=7.6.3
- GHCVER=7.8.2
- GHCVER=head
matrix:
allow_failures:
- env: GHCVER=head
before_install:
- sudo add-apt-repository -y ppa:hvr/ghc
- sudo apt-get update
- sudo apt-get install cabal-install-1.18 ghc-$GHCVER
- export PATH=/opt/ghc/$GHCVER/bin:$PATH
install:
- cabal-1.18 update
- cabal-1.18 install --only-dependencies --enable-tests;
script:
- cabal-1.18 configure --enable-tests -v2
- cabal-1.18 build
- cabal-1.18 test
- cabal-1.18 check
- cabal-1.18 sdist

View File

@ -1,6 +1,10 @@
cryptonite cryptonite
========== ==========
[![Build Status](https://travis-ci.org/vincenthz/cryptonite.png?branch=master)](https://travis-ci.org/vincenthz/cryptonite)
[![BSD](http://b.repl.ca/v1/license-BSD-blue.png)](http://en.wikipedia.org/wiki/BSD_licenses)
[![Haskell](http://b.repl.ca/v1/language-haskell-lightgrey.png)](http://haskell.org)
Cryptonite is a haskell repository of cryptographic primitives. Each crypto Cryptonite is a haskell repository of cryptographic primitives. Each crypto
algorithm have specificities, that are hard to wrap in common APIs and types, algorithm have specificities, that are hard to wrap in common APIs and types,
so instead of trying to provide a common ground for algorithms that wouldn't so instead of trying to provide a common ground for algorithms that wouldn't

View File

@ -11,6 +11,7 @@ Category: Cryptography
Stability: experimental Stability: experimental
Build-Type: Simple Build-Type: Simple
Homepage: https://github.com/vincenthz/cryptonite Homepage: https://github.com/vincenthz/cryptonite
Bug-reports: https://github.com/vincenthz/cryptonite/issues
Cabal-Version: >=1.10 Cabal-Version: >=1.10
extra-source-files: README.md extra-source-files: README.md
cbits/*.h cbits/*.h
@ -42,7 +43,6 @@ Test-Suite test-cryptonite
Build-Depends: base >= 3 && < 5 Build-Depends: base >= 3 && < 5
, bytestring , bytestring
, byteable , byteable
, mtl
, tasty , tasty
, tasty-quickcheck , tasty-quickcheck
, tasty-hunit , tasty-hunit

View File

@ -2,6 +2,7 @@
module KATSalsa (vectors) where module KATSalsa (vectors) where
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Data.ByteString.Char8 ()
key :: B.ByteString key :: B.ByteString
key = "\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09" key = "\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09"

View File

@ -5,6 +5,7 @@ import Control.Applicative
import Data.Byteable import Data.Byteable
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import qualified Data.ByteString as B import qualified Data.ByteString as B
import Data.ByteString.Char8 ()
import Test.Tasty import Test.Tasty
import Test.Tasty.QuickCheck import Test.Tasty.QuickCheck
import Test.Tasty.HUnit import Test.Tasty.HUnit