aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2016-10-05 11:11:15 +0300
committerJohn Crispin <john@phrozen.org>2016-10-26 15:16:51 +0200
commit82132540a3efbc98f8f4379b26d4b4541013e69d (patch)
tree31e3e8afa49da8cc446565f1ffec9348d467f951
parent89817614bb4f275996b72fc76e41acf3a031e716 (diff)
downloadupstream-82132540a3efbc98f8f4379b26d4b4541013e69d.tar.gz
upstream-82132540a3efbc98f8f4379b26d4b4541013e69d.tar.bz2
upstream-82132540a3efbc98f8f4379b26d4b4541013e69d.zip
uhttpd: prefer px5g for certificate creation
Prefer the old default 'px5g' for certificate creation as Firefox seems to dislike OpenSSL-created certs. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
-rwxr-xr-xpackage/network/services/uhttpd/files/uhttpd.init4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index d703d762e6..35c1985cd2 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -44,10 +44,10 @@ generate_keys() {
config_get location "$cfg" location
config_get commonname "$cfg" commonname
- # Prefer OpenSSL for certificate generation (existence evaluated last)
+ # Prefer px5g for certificate generation (existence evaluated last)
local GENKEY_CMD=""
- [ -x "$PX5G_BIN" ] && GENKEY_CMD="$PX5G_BIN selfsigned -der"
[ -x "$OPENSSL_BIN" ] && GENKEY_CMD="$OPENSSL_BIN req -x509 -outform der -nodes"
+ [ -x "$PX5G_BIN" ] && GENKEY_CMD="$PX5G_BIN selfsigned -der"
[ -n "$GENKEY_CMD" ] && {
$GENKEY_CMD \
-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \