TLS: switch to ocaml-tls

This commit is contained in:
Vincent Bernardoff 2018-04-27 09:43:29 +02:00 committed by Grégoire Henry
parent 387d863f18
commit 63e44af5e4
5 changed files with 5 additions and 13 deletions

View File

@ -55,8 +55,7 @@ COPY keys /etc/apk/keys/
COPY leveldb-$leveldb_version-r0.apk .
RUN apk --no-cache add \
libssl1.0 libsodium libev gmp vim \
leveldb-1.18-r0.apk && \
libev gmp vim leveldb-1.18-r0.apk && \
rm leveldb-$leveldb_version-r0.apk
COPY bin/* /usr/local/bin/

View File

@ -52,8 +52,8 @@ COPY leveldb-dev-$leveldb_version-r0.apk .
RUN apk --no-cache add \
build-base bash perl xz m4 git curl tar rsync patch sudo jq \
ncurses-dev gmp-dev libev-dev libressl-dev \
pcre-dev zlib-dev libsodium-dev \
ncurses-dev gmp-dev libev-dev \
pcre-dev zlib-dev \
snappy snappy-dev \
leveldb-$leveldb_version-r0.apk \
leveldb-dev-$leveldb_version-r0.apk && \

View File

@ -14,7 +14,7 @@
tezos-embedded-protocol-demo
tezos-embedded-protocol-alpha
cmdliner
ssl))
tls))
(flags (:standard -w -9+27-30-32-40@8
-safe-string
-open Tezos_base__TzPervasives

View File

@ -188,13 +188,6 @@ let init_node ?sandbox (config : Node_config_file.t) =
config.shell.prevalidator_limits
config.shell.chain_validator_limits
let () =
let old_hook = !Lwt.async_exception_hook in
Lwt.async_exception_hook := function
| Ssl.Read_error _ -> ()
| Ssl.Write_error _ -> ()
| exn -> old_hook exn
let init_rpc (rpc_config: Node_config_file.rpc) node =
match rpc_config.listen_addr with
| None ->

View File

@ -18,7 +18,7 @@ depends: [
"tezos-embedded-protocol-demo"
"tezos-embedded-protocol-alpha"
"cmdliner"
"ssl"
"tls"
]
build: [
[ "jbuilder" "build" "-p" name "-j" jobs ]