[source] uhttpd: prefer px5g for certificate creation

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 26 06:22:32 PDT 2016


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/82132540a3efbc98f8f4379b26d4b4541013e69d

commit 82132540a3efbc98f8f4379b26d4b4541013e69d
Author: Hannu Nyman <hannu.nyman at iki.fi>
AuthorDate: Wed Oct 5 11:11:15 2016 +0300

    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 at iki.fi>
---
 package/network/services/uhttpd/files/uhttpd.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index d703d76..35c1985 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" \



More information about the lede-commits mailing list