bcrypt 0.15. check ip address prefix

Cargo.toml

@@ -101,8 +101,6 @@ cyw43 = { git = "https://github.com/embassy-rs/embassy/", rev = "2eb7a67c7027c67
 cyw43-pio = { git = "https://github.com/embassy-rs/embassy/", rev = "2eb7a67c7027c6768fa95031caf60bcd0eade1ad" }
 embassy-net-w5500 = { git = "https://github.com/embassy-rs/embassy/", rev = "2eb7a67c7027c6768fa95031caf60bcd0eade1ad" }
 
-bcrypt = { version = "0.14", git = "https://github.com/mkj/rust-bcrypt", branch = "noalloc" }
-
 # these are mostly applicable to picow, but can't hurt generally
 [profile.dev]
 debug = 2

embassy/demos/common/Cargo.toml

@@ -21,7 +21,7 @@ heapless = "0.7.15"
 embedded-io = { version = "0.4", features = ["async"] }
 sha2 = { version = "0.10", default-features = false }
 hmac = { version = "0.12", default-features = false }
-bcrypt = { version = "0.14", default-features = false }
+bcrypt = { version = "0.15", default-features = false }
 ed25519-dalek = { version = "2.0.0-rc.2", default-features = false }
 
 defmt = { version = "0.3", optional = true }

embassy/demos/common/src/config.rs

@@ -179,6 +179,11 @@ where
         let ad: [u8; 4] = SSHDecode::dec(s)?;
         let ad = Ipv4Address::from_bytes(&ad);
         let prefix = SSHDecode::dec(s)?;
+        if prefix > 32 {
+            // emabassy panics, so test it here
+            debug!("Prefix {} > 32", prefix);
+            return Err(WireError::PacketWrong)
+        }
         let gw: Option<[u8; 4]> = dec_option(s)?;
         let gateway = gw.map(|gw| Ipv4Address::from_bytes(&gw));
         Ok(StaticConfigV4 {
@@ -365,8 +370,8 @@ mod tests {
             ),
             mac: [6, 2, 3, 4, 5, 6],
             ip4_static: Some(embassy_net::StaticConfigV4 {
-                address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address::UNSPECIFIED, 8),
-                gateway: Some(embassy_net::Ipv4Address::UNSPECIFIED),
+                address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address([44,33,22,11]), 8),
+                gateway: Some(embassy_net::Ipv4Address([1,2,3,4])),
                 // no dns servers. may need changing later?
                 dns_servers: heapless::Vec::new(),
             }),

embassy/demos/std/src/main.rs

@@ -44,7 +44,18 @@ async fn net_task(stack: &'static Stack<TunTapDevice>) -> ! {
 async fn main_task(spawner: Spawner) {
     // TODO config
     let opt_tap0 = "tap0";
-    let net_config = Config::dhcpv4(Default::default());
+
+    let config = &*singleton!(  {
+        let mut config = SSHConfig::new().unwrap();
+        // config.set_console_pw(Some("pw")).unwrap();
+        SunsetMutex::new(config)
+    } );
+
+    let net_config = if let Some(ref s) = config.lock().await.ip4_static {
+        embassy_net::Config::ipv4_static(s.clone())
+    } else {
+        embassy_net::Config::dhcpv4(Default::default())
+    };
 
     // Init network device
     let device = TunTapDevice::new(opt_tap0).unwrap();
@@ -62,12 +73,6 @@ async fn main_task(spawner: Spawner) {
     // Launch network task
     spawner.spawn(net_task(stack)).unwrap();
 
-    let config = &*singleton!(  {
-        let mut config = SSHConfig::new().unwrap();
-        // config.set_console_pw(Some("pw")).unwrap();
-        SunsetMutex::new(config)
-    } );
-
     for _ in 0..NUM_LISTENERS {
         spawner.spawn(listener(stack, config)).unwrap();
     }