hs20: some small improvements

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

Signed-off-by: Daniel Golle <redacted>

diff --git a/net/hs20/Makefile b/net/hs20/Makefile
index daad12f9e973a61b43498060ce3c62c070b649c3..b5748708766ac203ad0f02c99f9c7a31a88deba4 100644 (file)
--- a/net/hs20/Makefile
+++ b/net/hs20/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hs20
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
@@ -20,8 +20,8 @@ PKG_CPE_ID:=cpe:/a:w1.fi:hostapd
 
 define Download/dm-ddf-dtd
   URL:=http://www.openmobilealliance.org/tech/DTD
-  FILE:=dm_ddf-v1_2.dtd
-  HASH:=1fb8f97ee13b673e0d2386ef3ec64fbc9c8d75429a9725dc3fac295c4d5ccae4
+  FILE:=dm_ddf-v1_3.dtd
+  HASH:=9b3e1dc66a2d38fc6e1300e9fb6f06f95d042206dabc94ae989739feaeb0733e
 endef
 
 define Download/spp-xsd
@@ -116,7 +116,7 @@ endef
 
 define Package/hs20-common/install
        $(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
 endef
 

diff --git a/net/hs20/files/hs20.init b/net/hs20/files/hs20.init
index 3812dd866f326fbe67ae83cc77a96c310dd43c75..c23fcf807200d69ef4bb10d2eff4590a44aace48 100644 (file)
--- a/net/hs20/files/hs20.init
+++ b/net/hs20/files/hs20.init
@@ -31,6 +31,12 @@ setup_ca() {
        mkdir -p /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
 }
 
@@ -64,6 +70,8 @@ setup_dbconf() {
                sql_set $realm remediation_url "$remediation_url"
                sql_set $realm free_remediation_url "$free_remediation_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
 
        return 0