Merge pull request #106 from haydenroche5/stunnel_tests

Add script to run stunnel tests with wolfEngine.

Author: cconlon

bench.c

@@ -1164,7 +1164,7 @@ int main(int argc, char *argv[])
     const char *name = wolfengine_id;
 #else
     int staticBench = 0;
-    const char *name = wolfengine_lib;
+    const char *name = wolfengine_id;
 #endif /* WE_NO_DYNAMIC_ENGINE */
     const char *dir = ".libs";
     int i;

include/wolfengine/we_wolfengine.h

@@ -29,8 +29,6 @@
 #define WOLFENGINE_FAILURE      0
 #define WOLFENGINE_FATAL_ERROR -1
 
-/* This is the ID expected by OpenSSL when loading wolfEngine dynamically. */
-extern const char *wolfengine_lib;
 /* Engine id - implementation uses wolfSSL */
 extern const char *wolfengine_id;
 /* Engine name ... or description.  */

scripts/patches/stunnel-5.59/5.59.patch

@@ -0,0 +1,38 @@
+diff --git a/./src/options_new.c b/./src/options.c
+index 15c82bb..1281298 100644
+--- a/./src/options_new.c
++++ b/./src/options.c
+@@ -4585,6 +4585,15 @@ NOEXPORT char *engine_auto(void) {
+     return NULL; /* OK */
+ }
+ 
++static void stunnel_wolfengine_log(const int logLevel, const int component,
++                           const char *const logMessage)
++{
++    (void)logLevel;
++    (void)component;
++
++    s_log(LOG_INFO, "%s", logMessage);
++}
++
+ NOEXPORT char *engine_open(const char *name) {
+     engine_init(); /* initialize the previous engine (if any) */
+     if(++current_engine>=MAX_ENGINES)
+@@ -4605,6 +4614,19 @@ NOEXPORT char *engine_open(const char *name) {
+         s_log(LOG_INFO, "UI not supported by engine #%d (%s)",
+             current_engine+1, ENGINE_get_id(engines[current_engine]));
+     }
++
++    if (ENGINE_ctrl_cmd(engines[current_engine], "set_logging_cb", 0, NULL,
++                        (void(*)(void))stunnel_wolfengine_log, 0)) {
++        s_log(LOG_NOTICE, "wolfEngine logging callback set for engine #%d (%s)",
++            current_engine+1, ENGINE_get_id(engines[current_engine]));
++    }
++    else {
++        ERR_clear_error();
++        s_log(LOG_INFO, "wolfEngine logging callback not supported by engine "
++              "#%d (%s)", current_engine+1,
++              ENGINE_get_id(engines[current_engine]));
++    }
++
+     return NULL; /* OK */