digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Bump openssl (#5054)

Browse Source 
* Bump openssl

The previous one has stopped working for some reason :sadpanda:

changelog_begin
changelog_end

* daml-assistant: Add `--wall-clock-time` to the Sandbox Next test.

Missed this due to doing two things at once.

CHANGELOG_BEGIN
CHANGELOG_END

Co-authored-by: Samir Talwar <samir.talwar@digitalasset.com>
This commit is contained in:
Moritz Kiefer 2020-03-18 10:24:05 +01:00 committed by GitHub
parent bd6db5be68
commit 42b4441159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daml-assistant/integration-tests/src/DA/Daml/Assistant/IntegrationTests.hs
View File

@ -349,7 +349,7 @@ quickstartTests quickstartDir mvnDir = testGroup "quickstart"
withCurrentDirectory quickstartDir $
withDevNull $ \devNull -> do
p :: Int <- fromIntegral <$> getFreePort
let sandboxProc = (shell $ unwords ["daml", "sandbox-next", "--port", show p, ".daml/dist/quickstart-0.0.1.dar"]) { std_out = UseHandle devNull, std_in = CreatePipe }
let sandboxProc = (shell $ unwords ["daml", "sandbox-next", "--wall-clock-time", "--port", show p, ".daml/dist/quickstart-0.0.1.dar"]) { std_out = UseHandle devNull, std_in = CreatePipe }
withCreateProcess sandboxProc $
\_ _ _ ph -> race_ (waitForProcess' sandboxProc ph) $ do
waitForConnectionOnPort (threadDelay 100000) p

10
dev-env/windows/manifests/openssl.json
View File

@ -1,6 +1,6 @@
{
"homepage": "https://slproweb.com/products/Win32OpenSSL.html",
"version": "1.1.1d",
"version": "1.1.1e",
"license": {
"identifier": "OpenSSL|Freeware",
"url": "https://www.openssl.org/source/license-openssl-ssleay.txt"
@ -8,12 +8,12 @@
"description": "TLS/SSL toolkit",
"architecture": {
"64bit": {
"url": "https://slproweb.com/download/Win64OpenSSL-1_1_1d.exe",
"hash": "6afa17d0768cf91b6f69f31fbc67cab1ac2e3f40ccaaadb7a9d6c7fc37b38492"
"url": "https://slproweb.com/download/Win64OpenSSL-1_1_1e.exe",
"hash": "757a3b38370362df05756e45249f96c3193a387f04a650a7001b365f4eb11f10"
},
"32bit": {
"url": "https://slproweb.com/download/Win32OpenSSL-1_1_1d.exe",
"hash": "414fb64197a60b4167b367a5b7975511231c439b9d0237625450cb87d47550ab"
"url": "https://slproweb.com/download/Win32OpenSSL-1_1_1e.exe",
"hash": "b4d325f3fb43deb9f7a3bc2ba1b14c9029212b3865430eeb2fdbca86e1b76008"
}
},
"innosetup": true,