1 files changed, 7 insertions, 9 deletions
diff --git a/fw/esp32/components/eos/rng.c b/fw/esp32/components/eos/rng.c
index 675a79c..6f53a0b 100644
--- a/fw/esp32/components/eos/rng.c
+++ b/fw/esp32/components/eos/rng.c
@@ -7,21 +7,19 @@
 
 static const char *TAG = "EOS RNG";
 
-static void rng_handler(unsigned char _mtype, unsigned char *buffer, uint16_t buf_len) {
+static void rng_handler(unsigned char _mtype, EOSMessage *msg, uint16_t len) {
+    unsigned char *buffer = msg->buffer;
     uint16_t rng_len = 0;
 
-    if (buf_len < sizeof(uint16_t)) goto rng_handler_fin;
+    if (!(eos_msg_flags(msg) & EOS_MSG_FLAG_RPLY_REQ)) return;
+    if (len < sizeof(uint16_t)) return;
 
     rng_len  = (uint16_t)buffer[0] << 8;
     rng_len |= (uint16_t)buffer[1];
-    if (rng_len > EOS_NET_SIZE_BUF) {
-        rng_len = 0;
-        goto rng_handler_fin;
-    }
-    esp_fill_random(buffer, rng_len);
+    if (rng_len > msg->size) return;
 
-rng_handler_fin:
-    eos_net_reply(EOS_NET_MTYPE_RNG, buffer, rng_len);
+    esp_fill_random(buffer, rng_len);
+    eos_net_reply(EOS_NET_MTYPE_RNG, msg, rng_len);
 }
 
 void eos_rng_init(void) {