From 7b9215c8b91a9001d72a2f218b0f9265d82dd3cf Mon Sep 17 00:00:00 2001
From: 9names <60134748+9names@users.noreply.github.com>
Date: Tue, 25 Jun 2024 20:33:55 +1000
Subject: [PATCH 1/3] Use published version of reqwless
---
examples/rp/Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
index 0610be0a0..9bd403f02 100644
--- a/examples/rp/Cargo.toml
+++ b/examples/rp/Cargo.toml
@@ -25,7 +25,7 @@ fixed = "1.23.1"
fixed-macro = "1.2"
# for web request example
-reqwless = { git = "https://github.com/drogue-iot/reqwless", features = ["defmt",]}
+reqwless = { version = "0.12.0", features = ["defmt",]}
serde = { version = "1.0.203", default-features = false, features = ["derive"] }
serde-json-core = "0.5.1"
From 14569002816f23d20f7a651ebcfab0a51333aff8 Mon Sep 17 00:00:00 2001
From: 9names <60134748+9names@users.noreply.github.com>
Date: Tue, 25 Jun 2024 20:47:27 +1000
Subject: [PATCH 2/3] Replace joke seed with best RNG available
---
examples/rp/src/bin/usb_ethernet.rs | 5 ++++-
examples/rp/src/bin/wifi_ap_tcp_server.rs | 3 ++-
examples/rp/src/bin/wifi_tcp_server.rs | 3 ++-
examples/rp/src/bin/wifi_webrequest.rs | 3 ++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/examples/rp/src/bin/usb_ethernet.rs b/examples/rp/src/bin/usb_ethernet.rs
index f1b124efa..22dc88d28 100644
--- a/examples/rp/src/bin/usb_ethernet.rs
+++ b/examples/rp/src/bin/usb_ethernet.rs
@@ -9,6 +9,7 @@ use defmt::*;
use embassy_executor::Spawner;
use embassy_net::tcp::TcpSocket;
use embassy_net::{Stack, StackResources};
+use embassy_rp::clocks::RoscRng;
use embassy_rp::peripherals::USB;
use embassy_rp::usb::{Driver, InterruptHandler};
use embassy_rp::{bind_interrupts, peripherals};
@@ -16,6 +17,7 @@ use embassy_usb::class::cdc_ncm::embassy_net::{Device, Runner, State as NetState
use embassy_usb::class::cdc_ncm::{CdcNcmClass, State};
use embassy_usb::{Builder, Config, UsbDevice};
use embedded_io_async::Write;
+use rand::RngCore;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@@ -45,6 +47,7 @@ async fn net_task(stack: &'static Stack<Device<'static, MTU>>) -> ! {
#[embassy_executor::main]
async fn main(spawner: Spawner) {
let p = embassy_rp::init(Default::default());
+ let mut rng = RoscRng;
// Create the driver, from the HAL.
let driver = Driver::new(p.USB, Irqs);
@@ -102,7 +105,7 @@ async fn main(spawner: Spawner) {
//});
// Generate random seed
- let seed = 1234; // guaranteed random, chosen by a fair dice roll
+ let seed = rng.next_u64();
// Init network stack
static STACK: StaticCell<Stack<Device<'static, MTU>>> = StaticCell::new();
diff --git a/examples/rp/src/bin/wifi_ap_tcp_server.rs b/examples/rp/src/bin/wifi_ap_tcp_server.rs
index 69ce4e8be..a870a6308 100644
--- a/examples/rp/src/bin/wifi_ap_tcp_server.rs
+++ b/examples/rp/src/bin/wifi_ap_tcp_server.rs
@@ -40,6 +40,7 @@ async fn main(spawner: Spawner) {
info!("Hello World!");
let p = embassy_rp::init(Default::default());
+ let mut rng = RoscRng;
let fw = include_bytes!("../../../../cyw43-firmware/43439A0.bin");
let clm = include_bytes!("../../../../cyw43-firmware/43439A0_clm.bin");
@@ -74,7 +75,7 @@ async fn main(spawner: Spawner) {
});
// Generate random seed
- let seed = 0x0123_4567_89ab_cdef; // chosen by fair dice roll. guarenteed to be random.
+ let seed = rng.next_u64();
// Init network stack
static STACK: StaticCell<Stack<cyw43::NetDriver<'static>>> = StaticCell::new();
diff --git a/examples/rp/src/bin/wifi_tcp_server.rs b/examples/rp/src/bin/wifi_tcp_server.rs
index bbb531807..d77f09290 100644
--- a/examples/rp/src/bin/wifi_tcp_server.rs
+++ b/examples/rp/src/bin/wifi_tcp_server.rs
@@ -43,6 +43,7 @@ async fn main(spawner: Spawner) {
info!("Hello World!");
let p = embassy_rp::init(Default::default());
+ let mut rng = RoscRng;
let fw = include_bytes!("../../../../cyw43-firmware/43439A0.bin");
let clm = include_bytes!("../../../../cyw43-firmware/43439A0_clm.bin");
@@ -77,7 +78,7 @@ async fn main(spawner: Spawner) {
//});
// Generate random seed
- let seed = 0x0123_4567_89ab_cdef; // chosen by fair dice roll. guarenteed to be random.
+ let seed = rng.next_u64();
// Init network stack
static STACK: StaticCell<Stack<cyw43::NetDriver<'static>>> = StaticCell::new();
diff --git a/examples/rp/src/bin/wifi_webrequest.rs b/examples/rp/src/bin/wifi_webrequest.rs
index e0c91df53..319785923 100644
--- a/examples/rp/src/bin/wifi_webrequest.rs
+++ b/examples/rp/src/bin/wifi_webrequest.rs
@@ -46,6 +46,7 @@ async fn main(spawner: Spawner) {
info!("Hello World!");
let p = embassy_rp::init(Default::default());
+ let mut rng = RoscRng;
let fw = include_bytes!("../../../../cyw43-firmware/43439A0.bin");
let clm = include_bytes!("../../../../cyw43-firmware/43439A0_clm.bin");
@@ -80,7 +81,7 @@ async fn main(spawner: Spawner) {
//});
// Generate random seed
- let seed = 0x0123_4567_89ab_cdef; // chosen by fair dice roll. guarenteed to be random.
+ let seed = rng.next_u64();
// Init network stack
static STACK: StaticCell<Stack<cyw43::NetDriver<'static>>> = StaticCell::new();
From 080b5869dad3d2eca9b290c11cdbf4c0e38b6463 Mon Sep 17 00:00:00 2001
From: 9names <60134748+9names@users.noreply.github.com>
Date: Tue, 25 Jun 2024 21:07:09 +1000
Subject: [PATCH 3/3] Fix rngcore imports in examples
---
examples/rp/src/bin/wifi_ap_tcp_server.rs | 2 ++
examples/rp/src/bin/wifi_tcp_server.rs | 2 ++
examples/rp/src/bin/wifi_webrequest.rs | 2 ++
3 files changed, 6 insertions(+)
diff --git a/examples/rp/src/bin/wifi_ap_tcp_server.rs b/examples/rp/src/bin/wifi_ap_tcp_server.rs
index a870a6308..4fc2690e3 100644
--- a/examples/rp/src/bin/wifi_ap_tcp_server.rs
+++ b/examples/rp/src/bin/wifi_ap_tcp_server.rs
@@ -13,11 +13,13 @@ use embassy_executor::Spawner;
use embassy_net::tcp::TcpSocket;
use embassy_net::{Config, Stack, StackResources};
use embassy_rp::bind_interrupts;
+use embassy_rp::clocks::RoscRng;
use embassy_rp::gpio::{Level, Output};
use embassy_rp::peripherals::{DMA_CH0, PIO0};
use embassy_rp::pio::{InterruptHandler, Pio};
use embassy_time::Duration;
use embedded_io_async::Write;
+use rand::RngCore;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
diff --git a/examples/rp/src/bin/wifi_tcp_server.rs b/examples/rp/src/bin/wifi_tcp_server.rs
index d77f09290..5575df677 100644
--- a/examples/rp/src/bin/wifi_tcp_server.rs
+++ b/examples/rp/src/bin/wifi_tcp_server.rs
@@ -13,11 +13,13 @@ use embassy_executor::Spawner;
use embassy_net::tcp::TcpSocket;
use embassy_net::{Config, Stack, StackResources};
use embassy_rp::bind_interrupts;
+use embassy_rp::clocks::RoscRng;
use embassy_rp::gpio::{Level, Output};
use embassy_rp::peripherals::{DMA_CH0, PIO0};
use embassy_rp::pio::{InterruptHandler, Pio};
use embassy_time::{Duration, Timer};
use embedded_io_async::Write;
+use rand::RngCore;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
diff --git a/examples/rp/src/bin/wifi_webrequest.rs b/examples/rp/src/bin/wifi_webrequest.rs
index 319785923..70b6f0949 100644
--- a/examples/rp/src/bin/wifi_webrequest.rs
+++ b/examples/rp/src/bin/wifi_webrequest.rs
@@ -14,10 +14,12 @@ use embassy_net::dns::DnsSocket;
use embassy_net::tcp::client::{TcpClient, TcpClientState};
use embassy_net::{Config, Stack, StackResources};
use embassy_rp::bind_interrupts;
+use embassy_rp::clocks::RoscRng;
use embassy_rp::gpio::{Level, Output};
use embassy_rp::peripherals::{DMA_CH0, PIO0};
use embassy_rp::pio::{InterruptHandler, Pio};
use embassy_time::{Duration, Timer};
+use rand::RngCore;
use reqwless::client::{HttpClient, TlsConfig, TlsVerify};
use reqwless::request::Method;
use serde::Deserialize;