Cherrypick Ocaml Changes (#95)

* Support more than one ocamltls version

* Further ocamltls fixes

* Even more fixes

* Try installing external dependencies as well

* Try another dependency approach

* Try yet another dependency approach

* Instead of building from scratch, use a precompiled version

* Fix edit error

* Install m4 before opam

* libgmp changes so file name

* Try with regular libgmp

* Add debugging output

* Try getting libgmp from /usr/lib

* hybrid approach

* Fix typo

* explicitly install pkg-config

* Use new build script

* Use topkg build command

* Add topkg care as a dependency

* Trying another building approach

* Trying another building approach

* Remove leftover sed call

* Running dune properly

* Changing hardcoded certificate path

* Removing default certificate files

* Try the echo_server instead of the test_server

* Try the fuzz_server instead of the test_server

---------

Co-authored-by: Jan Drees <jan.drees@uni-wuppertal.de>

Author: mmaehren

images/ocamltls/Dockerfile

@@ -1,32 +1,43 @@
 FROM ocaml/opam as ocamltls-base1
-RUN sudo apt install -y libgmp-dev
-RUN git clone --depth=1 --branch=0.8.0 https://github.com/mirleft/ocaml-tls
+ARG VERSION
+RUN sudo apt install -y libgmp-dev m4 pkg-config
+WORKDIR /home/opam/opam-repository
+RUN git checkout -B master origin/master
+RUN opam update
+RUN git clone --depth=1 --branch=${VERSION} https://github.com/mirleft/ocaml-tls
 WORKDIR /home/opam/ocaml-tls
+RUN sed -i -e 's~\./certificates/server\.pem~/cert/rsa2048cert\.pem~g' lwt/examples/ex_common.ml
+RUN sed -i -e 's~\./certificates/server\.key~/cert/rsa2048key\.pem~g' lwt/examples/ex_common.ml
 RUN eval `opam config env` &&\
-  opam install -y topkg cstruct nocrypto x509 ppx_cstruct oUnit cstruct-unix
+  opam install -y topkg topkg-care cstruct nocrypto x509 ppx_cstruct oUnit cstruct-unix
 RUN eval `opam config env` &&\
-  ocaml pkg/pkg.ml build --with-lwt true
+  opam install .
+RUN eval `opam config env` &&\
+  dune build lwt/examples/fuzz_server.exe
+RUN eval `opam config env` &&\
+  dune build lwt/examples/test_client.exe
+
 
 FROM entrypoint as ocamltls-base2
 COPY --from=ocamltls-base1 /lib/x86_64-linux-gnu/libdl.so.2 \
   /lib/x86_64-linux-gnu/librt.so.1 \
   /lib/x86_64-linux-gnu/libpthread.so.0 \
   /lib/x86_64-linux-gnu/libgcc_s.so.1 \
-  /lib/x86_64-linux-gnu/libgmp.so.10 \
+  /usr/lib/x86_64-linux-gnu/libgmp.so.10 \
   /lib/x86_64-linux-gnu/libm.so.6 \
   /lib/x86_64-linux-gnu/libc.so.6 /lib/
 COPY --from=ocamltls-base1 /lib64/ld-linux-x86-64.so.2 /lib64/
 
 FROM ocamltls-base2 as ocamltls-server
 LABEL "tls_implementation"="ocamltls"
-LABEL "tls_implementation_version"="0.8.0"
+LABEL "tls_implementation_version"="${VERSION}"
 LABEL "tls_implementation_connectionRole"="server"
-COPY --from=ocamltls-base1 /home/opam/ocaml-tls/_build/lwt/examples/test_server.native /bin/
-ENTRYPOINT ["server-entrypoint", "test_server.native"]
+COPY --from=ocamltls-base1 /home/opam/ocaml-tls/_build/default/lwt/examples/fuzz_server.exe /bin/
+ENTRYPOINT ["server-entrypoint", "fuzz_server.exe"]
 
 FROM ocamltls-base2 as ocamltls-client
 LABEL "tls_implementation"="ocamltls"
-LABEL "tls_implementation_version"="0.8.0"
+LABEL "tls_implementation_version"="${VERSION}"
 LABEL "tls_implementation_connectionRole"="client"
-COPY --from=ocamltls-base1 /home/opam/ocaml-tls/_build/lwt/examples/test_client.native /bin/
-ENTRYPOINT ["client-entrypoint", "test_client.native"]
+COPY --from=ocamltls-base1 /home/opam/ocaml-tls/_build/default/lwt/examples/test_client.exe /bin/
+ENTRYPOINT ["client-entrypoint", "test_client.exe"]

images/ocamltls/ocamltls.sh

@@ -2,7 +2,24 @@
 cd "$(dirname "$0")" || exit 1
 source ../helper-functions.sh
 
-_docker build -t ${DOCKER_REPOSITORY}ocamltls-server:0.8.0 --target ocamltls-server .
-_docker build -t ${DOCKER_REPOSITORY}ocamltls-client:0.8.0 --target ocamltls-client .
+array=(0.12.8 0.10.5)
+typeset -i i=0 max=${#array[*]}
+while (( i < max ))
+do
+	echo "Build OCaml-TLS ${array[$i]}:"
+	_docker build --build-arg VERSION=v${array[$i]} -t ${DOCKER_REPOSITORY}ocamltls-server:${array[$i]} -f Dockerfile --target ocamltls-server .
+	_docker build --build-arg VERSION=v${array[$i]} -t ${DOCKER_REPOSITORY}ocamltls-client:${array[$i]} -f Dockerfile --target ocamltls-client .
+	i=i+1
+done
+
+array=(0.10.4 0.8.0)
+typeset -i i=0 max=${#array[*]}
+while (( i < max ))
+do
+	echo "Build OCaml-TLS ${array[$i]}:"
+	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}ocamltls-server:${array[$i]} -f Dockerfile --target ocamltls-server .
+	_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}ocamltls-client:${array[$i]} -f Dockerfile --target ocamltls-client .
+	i=i+1
+done
 
 exit "$EXITCODE"