fix passphrase length limit to match WF200 API

Signed-off-by: samblenny
This commit is contained in:
Sam Blenny 2021-07-07 03:34:30 +00:00
parent 03ad8bd2e4
commit 803f6d496f
2 changed files with 17 additions and 13 deletions

View file

@ -318,12 +318,12 @@ impl Com {
pub fn wlan_set_ssid(&mut self, s: &String<1024>) -> Result<xous::Result, xous::Error> {
use core::fmt::Write;
// Enforce WPA2 length limit before passing strings on to WF200
const WPA2_SSID_MAX_LEN: usize = 32;
if s.len() > WPA2_SSID_MAX_LEN {
// Enforce WF200 driver API length limit
const WF200_SSID_MAX_LEN: usize = 32;
if s.len() > WF200_SSID_MAX_LEN {
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 buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
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> {
use core::fmt::Write;
// Enforce WPA2 length limit before passing strings on to WF200
const WPA2_PASS_MAX_LEN: usize = 63;
if s.len() > WPA2_PASS_MAX_LEN {
// Enforce WF200 driver API length limit
const WF200_PASS_MAX_LEN: usize = 64;
if s.len() > WF200_PASS_MAX_LEN {
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 buf = Buffer::into_buf(copy).or(Err(xous::Error::InternalError))?;
buf.lend(self.conn, Opcode::WlanSetPass.to_u32().unwrap())

View file

@ -42,17 +42,21 @@ impl<'a> ShellCmdApi<'a> for Wlan {
"setssid" => {
let mut val = String::<1024>::new();
join_tokens(&mut val, &mut tokens);
let _ = match env.com.wlan_set_ssid(&val) {
Ok(_) => write!(ret, "wlan setssid {}", val),
Err(_) => write!(ret, "Error: ssid max len is 32"),
};
if val.len() == 0 {
let _ = write!(ret, "Error: SSID too short");
} else {
let _ = match env.com.wlan_set_ssid(&val) {
Ok(_) => write!(ret, "wlan setssid {}", val),
Err(_) => write!(ret, "Error: SSID too long for WPA2"),
};
}
}
"setpass" => {
let mut val = String::<1024>::new();
join_tokens(&mut val, &mut tokens);
let _ = match env.com.wlan_set_pass(&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" => {