From 29b218068d39aa349bdbf3fa05c33ea6ee53fe09 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Fri, 19 Jan 2018 12:57:35 +0100
Subject: [PATCH] Simplify test certificate creation
At the same time, remove the "gen-certificate" target" since it is not
required as part of the build process and not documented elsewhere. This
script could be used for testing "examples/server".
---
Makefile.am | 18 ------------------
ci/gen-certificate.sh | 8 ++++++++
2 files changed, 8 insertions(+), 18 deletions(-)
create mode 100755 ci/gen-certificate.sh
diff --git a/Makefile.am b/Makefile.am
index 4745f6a6..6a8db917 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,13 +24,6 @@ SUBDIRS = lib tests third-party examples
ACLOCAL_AMFLAGS = -I m4
-CERTIFICATE_PASS=QUIC
-CERTIFICATE_INFO='/CN=localhost/O=QUIC./C=FR'
-CERTIFICATE_KEY=cert/server.key
-CERTIFICATE_TMP_KEY=$(CERTIFICATE_KEY).tmp
-CERTIFICATE_CSR_FILE=cert/server.csr
-CERTIFICATE_CRT_FILE=cert/server.crt
-
# Format source files using clang-format. Don't format source files
# under third-party directory since we are not responsible for thier
# coding style.
@@ -39,14 +32,3 @@ clang-format:
test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/ngtcp2/*.h \
examples/*.{cc,h}
-
-#generate certificate (ONLY USE FOR DEMO !)
-gen-certificate:
- mkdir -p cert
- openssl genrsa -aes256 -passout pass:$(CERTIFICATE_PASS) -out $(CERTIFICATE_KEY) 2048
- openssl req -passin pass:$(CERTIFICATE_PASS) -new -key $(CERTIFICATE_KEY) -out $(CERTIFICATE_CSR_FILE) -subj $(CERTIFICATE_INFO)
- cp $(CERTIFICATE_KEY) $(CERTIFICATE_TMP_KEY)
- openssl rsa -passin pass:$(CERTIFICATE_PASS) -in $(CERTIFICATE_TMP_KEY) -out $(CERTIFICATE_KEY)
- openssl x509 -req -days 30 -in $(CERTIFICATE_CSR_FILE) -signkey $(CERTIFICATE_KEY) -out $(CERTIFICATE_CRT_FILE)
- rm $(CERTIFICATE_TMP_KEY)
-
diff --git a/ci/gen-certificate.sh b/ci/gen-certificate.sh
new file mode 100755
index 00000000..dc9561b0
--- /dev/null
+++ b/ci/gen-certificate.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Generate a self-signed certificate for testing purposes.
+
+mkdir -p cert
+keyfile=cert/server.key
+certfile=cert/server.crt
+
+openssl req -newkey rsa:2048 -x509 -nodes -keyout "$keyfile" -new -out "$certfile" -subj /CN=localhost
--
GitLab