From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 15 Mar 2015 10:32:10 +0000 (+0000)
Subject: uhttpd: make generating SSL keys more reliable against interrupted boots
X-Git-Tag: reboot~3963
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=83cdd1623c833eba28f7b42336872d4131beea87;p=openwrt%2Fstaging%2Flynxis.git

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 59f7d80e77..c493aafe42 100755
--- 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
 		}