From f107fc057858d5f8c5807e097d0d3c7d72eb47f2 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 26 Jan 2018 13:11:56 +0100
Subject: [PATCH] Apply Chantra's patch

---
 dnscrypt-wrapper.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/dnscrypt-wrapper.sh b/dnscrypt-wrapper.sh
index 0ef7e6f..d7a8592 100755
--- a/dnscrypt-wrapper.sh
+++ b/dnscrypt-wrapper.sh
@@ -29,15 +29,13 @@ new_key() {
         --crypt-secretkey-file="${STKEYS_DIR}/${ts}.key" \
         --provider-cert-file="${STKEYS_DIR}/${ts}.cert" \
         --cert-file-expire-days=1 && \
-    mv -f "${STKEYS_DIR}/${ts}.cert" "${STKEYS_DIR}/dnscrypt.cert" && \
     /opt/dnscrypt-wrapper/sbin/dnscrypt-wrapper --gen-cert-file \
         --xchacha20 \
         --provider-publickey-file="${KEYS_DIR}/public.key" \
         --provider-secretkey-file="${KEYS_DIR}/secret.key" \
         --crypt-secretkey-file="${STKEYS_DIR}/${ts}.key" \
         --provider-cert-file="${STKEYS_DIR}/${ts}-xchacha20.cert" \
-        --cert-file-expire-days=1 && \
-    mv -f "${STKEYS_DIR}/${ts}-xchacha20.cert" "${STKEYS_DIR}/dnscrypt-xchacha20.cert"
+        --cert-file-expire-days=1
 }
 
 stkeys_files() {
@@ -48,6 +46,14 @@ stkeys_files() {
     echo "$res"
 }
 
+stcerts_files() {
+    res=""
+    for file in $(ls "$STKEYS_DIR"/[0-9]*.cert); do
+        res="${res}${file},"
+    done
+    echo "$res"
+}
+
 if [ ! -f "$KEYS_DIR/provider_name" ]; then
     exit 1
 fi
@@ -62,5 +68,5 @@ exec /opt/dnscrypt-wrapper/sbin/dnscrypt-wrapper \
     --listen-address=0.0.0.0:443 \
     --resolver-address=127.0.0.1:553 \
     --provider-name="$provider_name" \
-    --provider-cert-file="${STKEYS_DIR}/dnscrypt.cert,${STKEYS_DIR}/dnscrypt-xchacha20.cert" \
+    --provider-cert-file="$(stcerts_files)" \
     --crypt-secretkey-file=$(stkeys_files)