Fix Arduino progmem print, AVR WOLFSSL_USER_IO

Author: gojimmypi

IDE/ARDUINO/wolfssl-arduino.cpp

@@ -22,12 +22,35 @@
 #include <Arduino.h>
 #include "wolfssl.h"
 
-/* Function to allow wolfcrypt to use Arduino Serial.print for debug messages.
- * See wolfssl/wolfcrypt/logging.c */
+ /* Function to allow wolfcrypt to use Arduino Serial.print for debug messages.
+  * See wolfssl/wolfcrypt/logging.c */
+
+#if defined(__AVR__)
+#include <avr/pgmspace.h>  /* Required for PROGMEM handling on AVR */
+#endif
 
 int wolfSSL_Arduino_Serial_Print(const char* const s)
 {
     /* Reminder: Serial.print is only available in C++ */
-    Serial.println(F(s));
+    int is_progmem = 0;
+    const char* t;
+    t = s;
+
+#if defined(__AVR__)
+    /* Safely check if `s` is in PROGMEM, 0x8000 is typical for AVR flash */
+    if (reinterpret_cast<uint16_t>(t) >= 0x8000) {
+        while (pgm_read_byte(t)) {
+            Serial.write(pgm_read_byte(t++));
+        }
+        Serial.println();
+        is_progmem = 1;
+    }
+#endif
+
+    /* Print normally for non-AVR boards or RAM-stored strings */
+    if (!is_progmem) {
+        Serial.println(s);
+    }
+
     return 0;
 };

wolfssl/wolfcrypt/settings.h

@@ -316,6 +316,7 @@
 
     /* board-specific */
     #if defined(__AVR__)
+        #define WOLFSSL_USER_IO
         #define WOLFSSL_NO_SOCK
         #define NO_WRITEV
     #elif defined(__arm__)