Merge pull request #154 from ejohnstown/update

Updates for wolfSSL v5.0

Author: SparkiDev

configure.ac

@@ -68,6 +68,9 @@ if test "x$have_wolfssl" = "xyes"; then
     LDFLAGS="$LDFLAGS $WOLFSSL_LDFLAGS"
 fi
 
+AC_CHECK_HEADERS([wolfssl/wolfcrypt/kdf.h])
+AC_CHECK_FUNCS([wc_DhSetNamedKey])
+
 # DEBUG
 DEBUG_CFLAGS="-g -O0 -DWOLFENGINE_DEBUG"
 AX_DEBUG

include/wolfengine/we_internal.h

@@ -22,6 +22,10 @@
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 /* OpenSSL 3.0.0 has deprecated the ENGINE API. */
 #define OPENSSL_API_COMPAT      10101
 
@@ -75,6 +79,9 @@
 #include <wolfssl/wolfcrypt/ecc.h>
 #include <wolfssl/wolfcrypt/random.h>
 #include <wolfssl/wolfcrypt/pwdbased.h>
+#ifdef HAVE_WOLFSSL_WOLFCRYPT_KDF_H
+    #include <wolfssl/wolfcrypt/kdf.h>
+#endif
 
 #include <wolfengine/we_openssl_bc.h>
 #include <wolfengine/we_logging.h>

src/we_dh.c

@@ -1080,25 +1080,41 @@ static int we_dh_pkey_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
     if (ret == 1) {
         /* Set named DH parameters. */
         if (XSTRNCMP(type, "dh_param", 9) == 0) {
+        #ifndef HAVE_WC_DHSETNAMEDKEY
             const DhParams *params;
+        #else
+            int params;
+        #endif
 
             if (XSTRNCMP(value, "ffdhe2048", 10) == 0) {
                 WOLFENGINE_MSG(WE_LOG_KE,
                                "Setting named parameters: ffdhe2048");
+            #ifndef HAVE_WC_DHSETNAMEDKEY
                 params = wc_Dh_ffdhe2048_Get();
+            #else
+                params = WC_FFDHE_2048;
+            #endif
             }
         #ifdef HAVE_FFDHE_3072
             else if (XSTRNCMP(value, "ffdhe3072", 10) == 0) {
                 WOLFENGINE_MSG(WE_LOG_KE,
                                "Setting named parameters: ffdhe3072");
+            #ifndef HAVE_WC_DHSETNAMEDKEY
                 params = wc_Dh_ffdhe3072_Get();
+            #else
+                params = WC_FFDHE_3072;
+            #endif
             }
         #endif
         #ifdef HAVE_FFDHE_4096
             else if (XSTRNCMP(value, "ffdhe4096", 10) == 0) {
                 WOLFENGINE_MSG(WE_LOG_KE,
                                "Setting named parameters: ffdhe4096");
+            #ifndef HAVE_WC_DHSETNAMEDKEY
                 params = wc_Dh_ffdhe4096_Get();
+            #else
+                params = WC_FFDHE_4096;
+            #endif
             }
         #endif
             else {
@@ -1110,14 +1126,18 @@ static int we_dh_pkey_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
             }
 
             if (ret == 1) {
+            #ifndef HAVE_WC_DHSETNAMEDKEY
                 rc = wc_DhSetKey_ex(&dh->key, params->p, params->p_len,
                                               params->g, params->g_len,
-            #ifdef HAVE_FFDHE_Q
+                #ifdef HAVE_FFDHE_Q
                                               params->q, params->q_len
-            #else
+                #else
                                               NULL, 0
-            #endif
+                #endif
                                     );
+            #else
+                rc = wc_DhSetNamedKey(&dh->key, params);
+            #endif
                 if (rc != 0) {
                      WOLFENGINE_ERROR_MSG(WE_LOG_KE, "Failed set parameters");
                      ret = 0;

src/we_ecc.c

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include <wolfengine/we_wolfengine.h>
 #include <wolfengine/we_internal.h>
+#include <wolfengine/we_wolfengine.h>
 
 #ifdef WE_HAVE_ECC
 

src/we_fips.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
+#include <wolfengine/we_internal.h>
 #include <wolfengine/we_fips.h>
 
 /* Bitmask of FIPS checks in wolfEngine_FipsCheck. Can be set by application
@@ -46,4 +47,4 @@ void wolfEngine_SetFipsChecks(long checksMask)
 long wolfEngine_GetFipsChecks()
 {
     return fipsChecks;
-}
+}

src/we_internal.c

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include <wolfengine/we_wolfengine.h>
 #include <wolfengine/we_internal.h>
+#include <wolfengine/we_wolfengine.h>
 
 #ifdef WE_NO_OPENSSL_MALLOC
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L

src/we_openssl_bc.c

@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
+#include <wolfengine/we_internal.h>
 #include <wolfengine/we_openssl_bc.h>
 
 /* These were all added in OpenSSL 1.1.0 */

src/we_wolfengine.c

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#include <wolfengine/we_wolfengine.h>
 #include <wolfengine/we_internal.h>
+#include <wolfengine/we_wolfengine.h>
 
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
 /* Engine id - implementation uses wolfSSL */