Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hs20: some small improvements

Browse source 
* update device description framework to v1.3
 * setup methods in database
 * setup uhttpd to use hs20 cert

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-08-17 16:08:32 +01:00
parent e66d6daa17
commit 3421545a2c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/hs20/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hs20 PKG_NAME:=hs20
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
@ -20,8 +20,8 @@ PKG_CPE_ID:=cpe:/a:w1.fi:hostapd
define Download/dm-ddf-dtd define Download/dm-ddf-dtd
URL:=http://www.openmobilealliance.org/tech/DTD URL:=http://www.openmobilealliance.org/tech/DTD
FILE:=dm_ddf-v1_2.dtd FILE:=dm_ddf-v1_3.dtd
HASH:=1fb8f97ee13b673e0d2386ef3ec64fbc9c8d75429a9725dc3fac295c4d5ccae4 HASH:=9b3e1dc66a2d38fc6e1300e9fb6f06f95d042206dabc94ae989739feaeb0733e
endef endef
define Download/spp-xsd define Download/spp-xsd
@ -116,7 +116,7 @@ endef
define Package/hs20-common/install define Package/hs20-common/install
$(INSTALL_DIR) $(1)/etc/hs20/spp $(INSTALL_DIR) $(1)/etc/hs20/spp
$(INSTALL_DATA) $(DL_DIR)/dm_ddf-v1_2.dtd $(1)/etc/hs20/spp $(INSTALL_DATA) $(DL_DIR)/dm_ddf-v1_3.dtd $(1)/etc/hs20/spp
$(INSTALL_DATA) $(DL_DIR)/spp-v1_0.xsd $(1)/etc/hs20/spp/spp.xsd $(INSTALL_DATA) $(DL_DIR)/spp-v1_0.xsd $(1)/etc/hs20/spp/spp.xsd
endef endef

8
net/hs20/files/hs20.init
View file

@ -31,6 +31,12 @@ setup_ca() {
mkdir -p /etc/hs20/AS/Key mkdir -p /etc/hs20/AS/Key
cp /etc/hs20/ca/server.* /etc/hs20/ca/ca.pem /etc/hs20/AS/Key cp /etc/hs20/ca/server.* /etc/hs20/ca/ca.pem /etc/hs20/AS/Key
uci batch <<EOF
set uhttpd.main.cert='/etc/hs20/ca/server.pem'
set uhttpd.main.key='/etc/hs20/ca/server.key'
commit uhttpd
EOF
return 0 return 0
} }
@ -64,6 +70,8 @@ setup_dbconf() {
sql_set $realm remediation_url "$remediation_url" sql_set $realm remediation_url "$remediation_url"
sql_set $realm free_remediation_url "$free_remediation_url" sql_set $realm free_remediation_url "$free_remediation_url"
sql_set $realm signup_url "$signup_url" sql_set $realm signup_url "$signup_url"
echo "DELETE FROM wildcards WHERE identity='';"
echo "INSERT INTO wildcards(identity,methods) VALUES('','TTLS,TLS');"
) | sqlite3 /etc/hs20/AS/DB/eap_user.db ) | sqlite3 /etc/hs20/AS/DB/eap_user.db
return 0 return 0