Skip to content

Commit 7ef951c

Browse files
mmaehrenmmaehren
authored
Merge pull request #94 from tls-attacker/timingScanBuildMerge
New library versions
2 parents aa767ea + 6d14308 commit 7ef951c

File tree

18 files changed

+72
-68
lines changed

18 files changed

+72
-68
lines changed

‎images/botan/Dockerfile-3x‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM alpine-build:3.12 as botan-base1
2+
ARG VERSION
3+
RUN wget https://botan.randombit.net/releases/Botan-3.${VERSION}.tar.xz
4+
RUN tar -xf Botan-3.${VERSION}.tar.xz
5+
WORKDIR Botan-3.${VERSION}
6+
RUN apk add python2
7+
RUN ./configure.py --prefix=/build/ &&\
8+
make &&\
9+
make install
10+
11+
FROM entrypoint as botan-base2
12+
COPY --from=botan-base1 /lib/ld-musl-x86_64.so.1 \
13+
/usr/lib/libstdc++.so.6 \
14+
/usr/lib/libgcc_s.so.1 \
15+
/build/lib/libbotan* /lib/
16+
COPY --from=botan-base1 /build/bin/botan /bin/
17+
ADD https://raw.githubusercontent.com/randombit/botan/master/src/tests/data/tls-policy/compat.txt /compat.txt
18+
19+
FROM botan-base2 as botan-server
20+
ARG VERSION
21+
LABEL "tls_implementation"="botan"
22+
LABEL "tls_implementation_version"="3.${VERSION}"
23+
LABEL "tls_implementation_connectionRole"="server"
24+
ENTRYPOINT ["server-entrypoint", "botan", "tls_server"]
25+
26+
FROM botan-base2 as botan-client
27+
ARG VERSION
28+
LABEL "tls_implementation"="botan"
29+
LABEL "tls_implementation_version"="3.${VERSION}"
30+
LABEL "tls_implementation_connectionRole"="client"
31+
ENTRYPOINT ["client-entrypoint", "botan", "tls_client"]

‎images/botan/botan-2_X.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ do
1010
done
1111

1212

13-
versions=(11.0 12.0 12.1 13.0 14.0 15.0 16.0 17.0 17.1 17.2 17.3 19.3)
13+
versions=(11.0 12.0 12.1 13.0 14.0 15.0 16.0 17.0 17.1 17.2 17.3 18.0 18.1 18.2 19.0 19.1 19.2 19.3)
1414
for i in "${versions[@]}"
1515
do
1616
_docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}botan-server:2.${i} -f Dockerfile-2_11-x --target botan-server .
1717
_docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}botan-client:2.${i} -f Dockerfile-2_11-x --target botan-client .
1818
done
1919

20+
2021
exit "$EXITCODE"

‎images/botan/botan-3_X.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
cd "$(dirname "$0")" || exit 1
3+
source ../helper-functions.sh
4+
5+
versions=(0.0-alpha0 0.0-alpha1)
6+
for i in "${versions[@]}"
7+
do
8+
_docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}botan-server:3.${i} -f Dockerfile-3x --target botan-server .
9+
_docker build --build-arg VERSION=${i} -t ${DOCKER_REPOSITORY}botan-client:3.${i} -f Dockerfile-3x --target botan-client .
10+
done

‎images/botan/build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ exit_on_error
55

66
track_error ./botan-1_11_X.sh
77
track_error ./botan-2_X.sh
8+
track_error ./botan-3_X.sh
89

910
exit "$EXITCODE"

‎images/build-everything.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ def execute_docker(cmd, cwd):
105105
with LOG_WRITE_LOCK:
106106
if complete.returncode == 0:
107107
LOG_SUCCEED.writelines([tag + "\n"])
108+
LOG_SUCCEED.writelines([complete.stdout + "\n"])
108109
LOG_SUCCEED.flush()
109110
else:
110111
LOG_FAILED.writelines(["[!-!] Failed to build {}\n".format(tag), complete.stdout + "\n"])

‎images/gnutls/gnutls.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ done
1515

1616
# 3.6.6 and 3.6.5 does not compile due to strange errors
1717
# "Nettle lacks the required rsa_sec_decrypt function"
18-
array=(3 4 7 8 9 10 11 12 13 14 15)
18+
array=(3 4 7 8 9 10 11 12 13 14 15 16)
1919
typeset -i i=0 max=${#array[*]}
2020
while (( i < max ))
2121
do

‎images/libressl/libressl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cd "$(dirname "$0")" || exit 1
33
source ../helper-functions.sh
44

55
# version 3.x.x
6-
array=(7.0 3.0 3.1 2.0 2.1 2.2 2.3 1.0 1.1 1.2 1.3 1.4 1.5 0.0 0.1 0.2)
6+
array=(7.0 6.1 6.0 5.3 5.2 5.1 5.0 4.3 4.2 4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.0 1.1 1.2 1.3 1.4 1.5 0.0 0.1 0.2)
77
typeset -i i=0 max=${#array[*]}
88
while (( i < max ))
99
do

‎images/matrixssl/Dockerfile-3_x‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM alpine-build:3.12 as matrixssl-base1
22
ARG VERSION
3-
RUN git clone --depth=1 --branch=3-$(echo ${VERSION} | tr '.' '-')-open https://github.com/matrixssl/matrixssl
3+
ARG COMMIT
4+
RUN git clone git@github.com:amitv87/matrixssl.git
45
WORKDIR matrixssl
6+
RUN git checkout ${COMMIT}
57
RUN sed -i 's/define ALLOW_ANON_CONNECTIONS 0/define ALLOW_ANON_CONNECTIONS 1/g' apps/ssl/client.c
68
RUN if [ "$VERSION" = "8.3" ]; then make; else make libs; fi;
79
RUN make apps_common || true

‎images/matrixssl/Dockerfile-4_x‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM alpine-build:3.12 as matrixssl-base1
22
ARG VERSION
3-
RUN git clone --depth=1 --branch=4-$(echo ${VERSION} | tr '.' '-')-open https://github.com/matrixssl/matrixssl
3+
ARG COMMIT
4+
RUN git clone git@github.com:amitv87/matrixssl.git
45
WORKDIR matrixssl
6+
RUN git checkout ${COMMIT}
57
RUN sed -i 's/define ALLOW_ANON_CONNECTIONS 0/define ALLOW_ANON_CONNECTIONS 1/g' apps/ssl/client.c
68
RUN make
79

‎images/matrixssl/matrixssl.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,26 @@ cd "$(dirname "$0")" || exit 1
33
source ../helper-functions.sh
44

55
array=(6.0 5.1 3.0 2.2 2.1 1.0 0.2 0.1 0.0)
6+
commits=(effeb14219ab9b9560ddf0ea56f939a1aa8f1d71 69b5f2c6c335ebc18a131822660bbfa536dcf5d2 eec42aa814dca8285457cc808a150347b3ac8c00 f0b0d0a5c39065fe9f02e011a0f01e406054a387 91fd0f130294629fe6f17078c5306af42ca6cfa5 dbc2786c73d32f98c6496176c356778b6dac7de6 1518527031e43e5a6fda9f3b39d474041526a55a 5a72845b65d0b39bd2ac0921b3b38b60e34a7128 d0a51a7e434019ff20ba3dfb47fb9f9bafbb3540)
67
typeset -i i=0 max=${#array[*]}
78
while (( i < max ))
89
do
910
echo "Building: Matrixssl 4.${array[$i]}"
10-
_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}matrixssl-server:4.${array[$i]} -f Dockerfile-4_x --target matrixssl-server .
11-
_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}matrixssl-client:4.${array[$i]} -f Dockerfile-4_x --target matrixssl-client .
11+
_docker build --build-arg VERSION=${array[$i]} --build-arg COMMIT=${commits[$i]} -t ${DOCKER_REPOSITORY}matrixssl-server:4.${array[$i]} -f Dockerfile-4_x --target matrixssl-server .
12+
_docker build --build-arg VERSION=${array[$i]} --build-arg COMMIT=${commits[$i]} -t ${DOCKER_REPOSITORY}matrixssl-client:4.${array[$i]} -f Dockerfile-4_x --target matrixssl-client .
1213
i=i+1
1314
done
1415

1516
# 3.8.3 needs certificates in a specific place
1617
# if this version is needed, create a specific dockerfile for it
17-
array=(9.5 9.3 9.1 9.0 8.7b 8.7a 8.7 8.6 8.4)
18+
array=(9.5 9.3 9.1 9.0 8.6 8.4)
19+
commits=(83bff65b84d6f76b69d44a115469da2dd68decae 0790908cb0dd035f6dfe5bb27ecddb9af1596f5e e05dfbf65050c13ae02ca41cd6cae575e5403a28 7c741e9005644ca19c723c86311a14ea207af4dd aa9fb8e32c2b433aaf3fde67e61179f5eeb0a132 dba6bac4a25b94362c7d0d9e603db2bef178ba96 866749ebd8406f5956fc2ce9976337eb411bb592)
1820
typeset -i i=0 max=${#array[*]}
1921
while (( i < max ))
2022
do
2123
echo "Building: Matrixssl 3.${array[$i]}"
22-
_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}matrixssl-server:3.${array[$i]} -f Dockerfile-3_x --target matrixssl-server .
23-
_docker build --build-arg VERSION=${array[$i]} -t ${DOCKER_REPOSITORY}matrixssl-client:3.${array[$i]} -f Dockerfile-3_x --target matrixssl-client .
24+
_docker build --build-arg VERSION=${array[$i]} --build-arg COMMIT=${commits[$i]} -t ${DOCKER_REPOSITORY}matrixssl-server:3.${array[$i]} -f Dockerfile-3_x --target matrixssl-server .
25+
_docker build --build-arg VERSION=${array[$i]} --build-arg COMMIT=${commits[$i]} -t ${DOCKER_REPOSITORY}matrixssl-client:3.${array[$i]} -f Dockerfile-3_x --target matrixssl-client .
2426
i=i+1
2527
done
2628

0 commit comments

Comments
 (0)