Skip to content

Commit 01264b6

Browse files
author
Ritwick DSouza
committed
[raspbian] Added support for wep mode
1 parent f4c3328 commit 01264b6

2 files changed

Lines changed: 31 additions & 20 deletions

File tree

netjsonconfig/backends/raspbian/converters/wireless.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _get_encryption(self, wireless):
6868
'wpa': '1' if protocol == 'wpa' else '2',
6969
'wpa_key_mgmt': 'WPA-PSK',
7070
'wpa_passphrase': encryption.get('key'),
71-
'wpa_pairwise': self._get_cipher(encryption),
71+
'cipher': self._get_cipher(encryption),
7272
})
7373
elif method == 'enterprise':
7474
if wireless.get('mode') == 'access_point':
@@ -99,6 +99,7 @@ def _get_encryption(self, wireless):
9999
})
100100
elif 'wep' in protocol:
101101
new_encryption.update({
102+
'auth_algs': 1 if method == 'open' else 2,
102103
'protocol': 'wep',
103104
'method': method,
104105
'key': encryption.get('key', None)

netjsonconfig/backends/raspbian/templates/hostapd.jinja2

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,36 @@
4444
{% endif %}
4545
{% if wireless.encryption %}
4646
auth_algs={{ wireless.encryption.auth_algs }}
47-
wpa={{ wireless.encryption.wpa }}
48-
wpa_key_mgmt={{ wireless.encryption.wpa_key_mgmt }}
49-
{% if wireless.encryption.method == 'personal' %}
50-
wpa_passphrase={{ wireless.encryption.wpa_passphrase }}
51-
{% if wireless.encryption.wpa_pairwise != 'AUTO' %}
52-
wpa_pairwise={{ wireless.encryption.wpa_pairwise }}
53-
{% endif %}
54-
{% elif wireless.encryption.method == 'enterprise'%}
55-
ieee8021x=1
56-
eap_server=1
57-
eapol_version=1
58-
{% if wireless.encryption.auth_server_addr %}
59-
auth_server_addr={{ wireless.encryption.auth_server_addr }}
60-
{% endif %}
61-
{% if wireless.encryption.auth_server_port %}
62-
auth_server_port={{ wireless.encryption.auth_server_port }}
63-
{% endif %}
64-
{% if wireless.encryption.auth_server_shared_secret %}
65-
auth_server_shared_secret={{ wireless.encryption.auth_server_shared_secret }}
47+
{% if wireless.encryption.protocol == 'wpa' %}
48+
wpa={{ wireless.encryption.wpa }}
49+
wpa_key_mgmt={{ wireless.encryption.wpa_key_mgmt }}
50+
{% if wireless.encryption.method == 'personal' %}
51+
wpa_passphrase={{ wireless.encryption.wpa_passphrase }}
52+
{% if wireless.encryption.cipher != 'AUTO' %}
53+
{% if wireless.encryption.wpa == '1' %}
54+
wpa_pairwise={{ wireless.encryption.cipher }}
55+
{% endif %}
56+
{% if wireless.encryption.wpa == '2' %}
57+
rsn_pairwise={{ wireless.encryption.cipher }}
58+
{% endif %}
59+
{% endif %}
60+
{% elif wireless.encryption.method == 'enterprise'%}
61+
ieee8021x=1
62+
eap_server=1
63+
eapol_version=1
64+
{% if wireless.encryption.auth_server_addr %}
65+
auth_server_addr={{ wireless.encryption.auth_server_addr }}
66+
{% endif %}
67+
{% if wireless.encryption.auth_server_port %}
68+
auth_server_port={{ wireless.encryption.auth_server_port }}
69+
{% endif %}
70+
{% if wireless.encryption.auth_server_shared_secret %}
71+
auth_server_shared_secret={{ wireless.encryption.auth_server_shared_secret }}
72+
{% endif %}
6673
{% endif %}
74+
{% elif wireless.encryption.protocol == 'wep' %}
75+
wep_default_key=0
76+
wep_key0={{ wireless.encryption.key}}
6777
{% endif %}
6878
{% endif %}
6979

0 commit comments

Comments
 (0)