mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
fix passphrase length limit to match WF200 API
Signed-off-by: samblenny
This commit is contained in:
parent
03ad8bd2e4
commit
803f6d496f
2 changed files with 17 additions and 13 deletions
|
|
@ -318,12 +318,12 @@ impl Com {
|
||||||
|
|
||||||
pub fn wlan_set_ssid(&mut self, s: &String<1024>) -> Result<xous::Result, xous::Error> {
|
pub fn wlan_set_ssid(&mut self, s: &String<1024>) -> Result<xous::Result, xous::Error> {
|
||||||
use core::fmt::Write;
|
use core::fmt::Write;
|
||||||
// Enforce WPA2 length limit before passing strings on to WF200
|
// Enforce WF200 driver API length limit
|
||||||
const WPA2_SSID_MAX_LEN: usize = 32;
|
const WF200_SSID_MAX_LEN: usize = 32;
|
||||||
if s.len() > WPA2_SSID_MAX_LEN {
|
if s.len() > WF200_SSID_MAX_LEN {
|
||||||
return Err(xous::Error::InvalidString);
|
return Err(xous::Error::InvalidString);
|
||||||
}
|
}
|
||||||
let mut copy: String::<WPA2_SSID_MAX_LEN> = String::new();
|
let mut copy: String::<WF200_SSID_MAX_LEN> = String::new();
|
||||||
let _ = write!(copy, "{}", s);
|
let _ = write!(copy, "{}", s);
|
||||||
let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
|
let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
|
||||||
buf.lend(self.conn, Opcode::WlanSetSSID.to_u32().unwrap())
|
buf.lend(self.conn, Opcode::WlanSetSSID.to_u32().unwrap())
|
||||||
|
|
@ -331,12 +331,12 @@ impl Com {
|
||||||
|
|
||||||
pub fn wlan_set_pass(&mut self, s: &String<1024>) -> Result<xous::Result, xous::Error> {
|
pub fn wlan_set_pass(&mut self, s: &String<1024>) -> Result<xous::Result, xous::Error> {
|
||||||
use core::fmt::Write;
|
use core::fmt::Write;
|
||||||
// Enforce WPA2 length limit before passing strings on to WF200
|
// Enforce WF200 driver API length limit
|
||||||
const WPA2_PASS_MAX_LEN: usize = 63;
|
const WF200_PASS_MAX_LEN: usize = 64;
|
||||||
if s.len() > WPA2_PASS_MAX_LEN {
|
if s.len() > WF200_PASS_MAX_LEN {
|
||||||
return Err(xous::Error::InvalidString);
|
return Err(xous::Error::InvalidString);
|
||||||
}
|
}
|
||||||
let mut copy: String::<WPA2_PASS_MAX_LEN> = String::new();
|
let mut copy: String::<WF200_PASS_MAX_LEN> = String::new();
|
||||||
let _ = write!(copy, "{}", s);
|
let _ = write!(copy, "{}", s);
|
||||||
let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
|
let buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
|
||||||
buf.lend(self.conn, Opcode::WlanSetPass.to_u32().unwrap())
|
buf.lend(self.conn, Opcode::WlanSetPass.to_u32().unwrap())
|
||||||
|
|
|
||||||
|
|
@ -42,17 +42,21 @@ impl<'a> ShellCmdApi<'a> for Wlan {
|
||||||
"setssid" => {
|
"setssid" => {
|
||||||
let mut val = String::<1024>::new();
|
let mut val = String::<1024>::new();
|
||||||
join_tokens(&mut val, &mut tokens);
|
join_tokens(&mut val, &mut tokens);
|
||||||
|
if val.len() == 0 {
|
||||||
|
let _ = write!(ret, "Error: SSID too short");
|
||||||
|
} else {
|
||||||
let _ = match env.com.wlan_set_ssid(&val) {
|
let _ = match env.com.wlan_set_ssid(&val) {
|
||||||
Ok(_) => write!(ret, "wlan setssid {}", val),
|
Ok(_) => write!(ret, "wlan setssid {}", val),
|
||||||
Err(_) => write!(ret, "Error: ssid max len is 32"),
|
Err(_) => write!(ret, "Error: SSID too long for WPA2"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
}
|
||||||
"setpass" => {
|
"setpass" => {
|
||||||
let mut val = String::<1024>::new();
|
let mut val = String::<1024>::new();
|
||||||
join_tokens(&mut val, &mut tokens);
|
join_tokens(&mut val, &mut tokens);
|
||||||
let _ = match env.com.wlan_set_pass(&val) {
|
let _ = match env.com.wlan_set_pass(&val) {
|
||||||
Ok(_) => write!(ret, "wlan setpass {}", val),
|
Ok(_) => write!(ret, "wlan setpass {}", val),
|
||||||
Err(_) => write!(ret, "Error: pass max len is 63"),
|
Err(_) => write!(ret, "Error: passphrase too long for WPA2"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
"join" => {
|
"join" => {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue