Skip to content

Commit

Permalink
Use certs provided by interop framework (microsoft#853)
Browse files Browse the repository at this point in the history
  • Loading branch information
larseggert authored Sep 22, 2020
1 parent b796cb0 commit ea04c8c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ ENV PATH="/root/.dotnet/tools:${PATH}"
RUN cmake -DQUIC_BUILD_TEST=OFF -DQUIC_BUILD_PERF=OFF \
-DQUIC_ENABLE_LOGGING=on ..
RUN cmake --build .
RUN openssl ecparam -out server.eckey -noout -name prime256v1 -genkey
RUN openssl pkcs8 -topk8 -inform pem -in server.eckey -nocrypt \
-out server.key
RUN openssl req -batch -new -key server.key -days 9365 -nodes -x509 \
-subj "/" -addext "subjectAltName = DNS:server" -out server.crt

FROM martenseemann/quic-network-simulator-endpoint
RUN apt-get update -y \
Expand Down
4 changes: 3 additions & 1 deletion scripts/run_endpoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ if [ "$ROLE" == "client" ]; then
done
else
echo "Requests parameter: ${REQUESTS[@]}"
# FIXME: there doesn't seem to be a way to specify to use /certs/ca.pem
# for certificate verification
quicinterop ${CLIENT_PARAMS} -custom:server -port:443 -urls:"${REQUESTS[@]}" -version:-16777187
fi
# Wait for the logs to flush to disk.
Expand All @@ -79,5 +81,5 @@ elif [ "$ROLE" == "server" ]; then
esac

quicinteropserver ${SERVER_PARAMS} -root:/www -listen:* -port:443 \
-file:/server.crt -key:/server.key 2>&1
-file:/certs/cert.pem -key:/certs/priv.key 2>&1
fi

0 comments on commit ea04c8c

Please sign in to comment.