Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow-up to #205 and #216 #227

Merged
merged 2 commits into from
May 1, 2017
+22 −3
Merged

Follow-up to #205 and #216 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6c26d6
Bump cryptonite dependencies to 0.23
ocheron Apr 29, 2017
4775467
Restore the blockCipher we once had
ocheron Apr 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions core/Benchmarks/Benchmarks.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,25 @@ import Data.IORef
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as L

blockCipher :: Cipher
blockCipher = Cipher
{ cipherID = 0xff12
, cipherName = "rsa-id-const"
, cipherBulk = Bulk
{ bulkName = "id"
, bulkKeySize = 16
, bulkIVSize = 16
, bulkExplicitIV= 0
, bulkAuthTagLen= 0
, bulkBlockSize = 16
, bulkF = BulkBlockF $ \_ _ _ -> (\m -> (m, B.empty))
}
, cipherHash = MD5
, cipherPRFHash = Nothing
, cipherKeyExchange = CipherKeyExchange_RSA
, cipherMinVer = Nothing
}

recvDataNonNull :: Context -> IO B.ByteString
recvDataNonNull ctx = recvData ctx >>= \l -> if B.null l then recvDataNonNull ctx else return l

Expand Down
2 changes: 1 addition & 1 deletion core/tls.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Library
, data-default-class
-- crypto related
, memory
, cryptonite >= 0.21
, cryptonite >= 0.23
-- certificate related
, asn1-types >= 0.2.0
, asn1-encoding
Expand Down
2 changes: 1 addition & 1 deletion debug/tls-debug.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Executable tls-stunnel
, bytestring
, x509-system >= 1.0
, data-default-class
, cryptonite >= 0.21
, cryptonite >= 0.23
, tls >= 1.3.0 && < 1.4
if os(windows)
Buildable: False
Expand Down
2 changes: 1 addition & 1 deletion test-scripts/tls-test.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Executable TestClient
, bytestring
, x509-system >= 1.0
, data-default-class
, cryptonite >= 0.21
, cryptonite >= 0.23
, directory
, random
, async
Expand Down