Merge pull request #129 from haydenroche5/no_openssl_malloc

Add a define WE_NO_OPENSSL_MALLOC

Author: cconlon

include/wolfengine/we_internal.h

@@ -77,10 +77,35 @@
 #include <wolfssl/wolfcrypt/pwdbased.h>
 
 #include <wolfengine/we_openssl_bc.h>
-
 #include <wolfengine/we_logging.h>
 #include <wolfengine/we_fips.h>
 
+/* Defining WE_NO_OPENSSL_MALLOC will cause wolfEngine to not use the OpenSSL
+ * memory management functions (e.g. OPENSSL_malloc, OPENSSL_free, etc.).
+ * Instead, the corresponding wolfSSL functions will be used (e.g. XMALLOC,
+ * XFREE, etc.). */
+#ifdef WE_NO_OPENSSL_MALLOC
+#undef  OPENSSL_malloc
+#define OPENSSL_malloc(num)       XMALLOC((num), NULL, DYNAMIC_TYPE_TMP_BUFFER)
+#undef  OPENSSL_free
+#define OPENSSL_free(ptr)         XFREE((ptr), NULL, DYNAMIC_TYPE_TMP_BUFFER)
+#undef  OPENSSL_realloc
+#define OPENSSL_realloc(ptr, num) XREALLOC((ptr), (num), NULL, DYNAMIC_TYPE_TMP_BUFFER)
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+void *we_zalloc(size_t num);
+void we_clear_free(void *str, size_t num);
+void *we_memdup(const void *data, size_t siz);
+
+#undef  OPENSSL_zalloc
+#define OPENSSL_zalloc     we_zalloc
+#undef  OPENSSL_clear_free
+#define OPENSSL_clear_free we_clear_free
+#undef  OPENSSL_memdup
+#define OPENSSL_memdup     we_memdup
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+#endif /* WE_NO_OPENSSL_MALLOC */
+
 #if defined(__IAR_SYSTEMS_ICC__) || defined(__GNUC__)
     /* Function is a printf style function. Pretend parameter is string literal.
      *

src/we_internal.c

@@ -22,6 +22,42 @@
 #include <wolfengine/we_wolfengine.h>
 #include <wolfengine/we_internal.h>
 
+#ifdef WE_NO_OPENSSL_MALLOC
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+void *we_zalloc(size_t num)
+{
+    void *ret = XMALLOC(num, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+    if (ret != NULL) {
+        XMEMSET(ret, 0, num);
+    }
+    return ret;
+}
+
+void we_clear_free(void *str, size_t num)
+{
+    if (str == NULL)
+        return;
+    if (num)
+        OPENSSL_cleanse(str, num);
+    XFREE(str, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+}
+
+void *we_memdup(const void *data, size_t siz)
+{
+    void *ret;
+
+    if (data == NULL || siz >= INT_MAX)
+        return NULL;
+
+    ret = XMALLOC(siz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
+    if (ret == NULL) {
+        return NULL;
+    }
+    return XMEMCPY(ret, data, siz);
+}
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+#endif /* WE_NO_OPENSSL_MALLOC */
+
 /** Engine bound to. */
 static ENGINE *bound = NULL;