7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package: explicitely configure DTLS mode

Browse Source
This commit is contained in:
Daniel Golle 2016-08-24 12:35:35 +02:00
parent ec332d3e41
commit 543fc7298b
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openwrt/freewtp/files/wtp.config
View File

@ -3,10 +3,4 @@ config wtp
option location 'Magdeburg' option location 'Magdeburg'
option name 'wtp-ap' option name 'wtp-ap'
option host '127.0.0.1' option host '127.0.0.1'
# either use DTLS with ca, cert and key option dtlsmode 'off'
# option ca '/etc/wtp/ca.crt'
# option cert '/etc/wtp/wtp.crt'
# option key '/etc/wtp/wtp.key'
# or PSK
# option identity 'myname'
# option psk 'verysecret'

7
openwrt/freewtp/files/wtp.init
View File

@ -73,7 +73,7 @@ EOF
wtp_conf_x509() { wtp_conf_x509() {
echo " dtls: {" echo " dtls: {"
if [ -z "$psk" -a -z "$identity" -a -z "$ca" -a -z "$cert" -a -z "$key" ]; then if [ "$dtlsmode" = "off" ]; then
echo " enable = false;" echo " enable = false;"
echo " };" echo " };"
echo echo
@ -87,14 +87,14 @@ wtp_conf_x509() {
echo " dtlsdatachannel = false;" echo " dtlsdatachannel = false;"
echo " };" echo " };"
echo echo
if [ "$psk" -o "$identity" ]; then if [ "$dtlsmode" = "psk" ]; then
echo " type = \"presharedkey\";" echo " type = \"presharedkey\";"
echo echo
echo " presharedkey: {" echo " presharedkey: {"
echo " identity = \"${identity}\";" echo " identity = \"${identity}\";"
echo " pskkey = \"${psk}\";" echo " pskkey = \"${psk}\";"
echo " };" echo " };"
elif [ "$ca" -o "$cert" -o "$key" ]; then elif [ "$dtlsmode" = "x509" ]; then
echo " type = \"x509\";" echo " type = \"x509\";"
echo echo
echo " x509: {" echo " x509: {"
@ -265,6 +265,7 @@ wtp_uci_conf() {
config_get location "$1" location config_get location "$1" location
config_get country "$1" country config_get country "$1" country
config_get name "$1" name config_get name "$1" name
config_get dtlsmode "$1" dtlsmode
config_get ca "$1" ca config_get ca "$1" ca
config_get cert "$1" cert config_get cert "$1" cert
config_get key "$1" key config_get key "$1" key