domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uhttpd: make organization (O=) of the cert configurable via uci

Browse Source 
Make the organization (O=) of the cert configurable via uci. If not
configured, use a combination of "OpenWrt" and an unique id like it was
done before.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
(cherry picked from commit 2c6c1501af)
This commit is contained in:
Martin Schiller
2020-05-04 16:13:13 +02:00
committed by Paul Spooren
parent 76d90a5eaf
commit e604873e8a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/uhttpd/Makefile
View File

@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git

5
package/network/services/uhttpd/files/uhttpd.init
View File

@@ -35,13 +35,14 @@ generate_keys() {
local cfg="$1" local cfg="$1"
local key="$2" local key="$2"
local crt="$3" local crt="$3"
local days bits country state location commonname local days bits country state location organization commonname
config_get days "$cfg" days config_get days "$cfg" days
config_get bits "$cfg" bits config_get bits "$cfg" bits
config_get country "$cfg" country config_get country "$cfg" country
config_get state "$cfg" state config_get state "$cfg" state
config_get location "$cfg" location config_get location "$cfg" location
config_get organization "$cfg" organization
config_get commonname "$cfg" commonname config_get commonname "$cfg" commonname
config_get key_type "$cfg" key_type config_get key_type "$cfg" key_type
config_get ec_curve "$cfg" ec_curve config_get ec_curve "$cfg" ec_curve
@@ -56,7 +57,7 @@ generate_keys() {
[ -n "$GENKEY_CMD" ] && { [ -n "$GENKEY_CMD" ] && {
$GENKEY_CMD \ $GENKEY_CMD \
-days ${days:-730} -newkey ${KEY_OPTS} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \ -days ${days:-730} -newkey ${KEY_OPTS} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
-subj /C="${country:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}" -subj /C="${country:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/O="${organization:-OpenWrt$UNIQUEID}"/CN="${commonname:-OpenWrt}"
sync sync
mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}" mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}" mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"