uhttpd: make generating SSL keys more reliable against interrupted boots

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44772

diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index 59f7d80e77db0d6ee2e8db6f3ec2cc2e04d23e28..c493aafe4255d0eade70bafe6566752669f86902 100755 (executable)
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -45,8 +45,11 @@ generate_keys() {
 
        [ -x "$PX5G_BIN" ] && {
                $PX5G_BIN selfsigned -der \
-                       -days ${days:-730} -newkey rsa:${bits:-1024} -keyout "$UHTTPD_KEY" -out "$UHTTPD_CERT" \
+                       -days ${days:-730} -newkey rsa:${bits:-1024} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
                        -subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/CN="${commonname:-OpenWrt}"
+               sync
+               mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
+               mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"
        }
 }
 
@@ -111,7 +114,7 @@ start_instance()
        config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt
 
        [ -f /lib/libustream-ssl.so ] && [ -n "$https" ] && {
-               [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || {
+               [ -s "$UHTTPD_CERT" -a -s "$UHTTPD_KEY" ] || {
                        config_foreach generate_keys cert
                }