From: Hannu Nyman Date: Wed, 5 Oct 2016 08:11:15 +0000 (+0300) Subject: uhttpd: prefer px5g for certificate creation X-Git-Tag: v17.01.0-rc1~1041 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=82132540a3efbc98f8f4379b26d4b4541013e69d 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 --- 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" \