Update to wolfSSL 5.3.0

Also fix issue where tox wasn't grabbing wolfSSL from git.

Author: LinuxJedi

lib/wolfssl

@@ -50,27 +50,6 @@
     long_description = long_description.replace(".. include:: LICENSING.rst\n",
                                                 licensing_file.read())
 
-def verify_wolfssl_config():
-    # verify wolfSSL library has been configured correctly, so that cffi
-    # binding work correctly.
-
-    # open <wolfssl/options.h> header to parse for #define's
-    # This will throw a FileNotFoundError if not able to find options.h
-    optionsHeaderPath = wolfssl_inc_path() + "/wolfssl/options.h"
-    optionsHeader = open(optionsHeaderPath, 'r')
-    optionsHeaderStr = optionsHeader.read()
-    optionsHeader.close()
-
-    # require HAVE_SNI (--enable-sni) in native lib
-    if '#define HAVE_SNI' not in optionsHeaderStr:
-        raise RuntimeError("wolfSSL needs to be compiled with --enable-sni")
-
-    # require OPENSSL_EXTRA (--enable-opensslextra) in native lib
-    if '#define OPENSSL_EXTRA' not in optionsHeaderStr:
-        raise RuntimeError("wolfSSL needs to be compiled with "
-            "--enable-opensslextra")
-
-
 setup(
     name="wolfssl",
     version=verstr,

setup.py

@@ -3,8 +3,6 @@ envlist = py3
 
 [testenv]
 wheel = true
-setenv =
-    PYTHONPATH = {toxinidir}:{toxinidir}/wolfssl-py
 
 deps = -rrequirements/test.txt
 commands = py.test tests/

tox.ini

@@ -31,6 +31,7 @@
 import subprocess
 import shlex
 import os
+import sys
 from ctypes import cdll
 from collections import namedtuple
 
@@ -249,11 +250,38 @@ def generate_libwolfssl():
         get_platform(), version))
     make(make_flags(prefix, False))
 
-
+# detect features if user has built against local wolfSSL library
+# if they are not, we are controlling build options above
 local_wolfssl = os.environ.get("USE_LOCAL_WOLFSSL")
-if local_wolfssl and get_libwolfssl() == 0:
-    generate_libwolfssl()
-    get_libwolfssl()
+if local_wolfssl:
+    # Try to do native wolfSSL/wolfCrypt feature detection.
+    # Open <wolfssl/options.h> header to parse for #define's
+    # This will throw a FileNotFoundError if not able to find options.h
+    optionsHeaderPath = wolfssl_inc_path() + "/wolfssl/options.h"
+    optionsHeader = open(optionsHeaderPath, 'r')
+    optionsHeaderStr = optionsHeader.read()
+    optionsHeader.close()
+    # require HAVE_SNI (--enable-sni) in native lib
+    if '#define HAVE_SNI' not in optionsHeaderStr:
+        raise RuntimeError("wolfSSL needs to be compiled with --enable-sni")
+
+    # require OPENSSL_EXTRA (--enable-opensslextra) in native lib
+    if '#define OPENSSL_EXTRA' not in optionsHeaderStr:
+        raise RuntimeError("wolfSSL needs to be compiled with "
+            "--enable-opensslextra")
+    featureDetection = 1
+    sys.stderr.write("\nDEBUG: Found <wolfssl/options.h>, attempting native "
+                     "feature detection\n")
+
+else:
+    optionsHeaderStr = ""
+    featureDetection = 0
+    sys.stderr.write("\nDEBUG: Skipping native feature detection, build not "
+                     "using USE_LOCAL_WOLFSSL\n")
+    if get_libwolfssl() == 0:
+        generate_libwolfssl()
+        get_libwolfssl()
+
 
 WolfFunction = namedtuple("WolfFunction", ["name", "native_sig", "ossl_sig"])
 # Depending on how wolfSSL was configured, the functions below may or may not be

wolfssl/_build_ffi.py

@@ -1,11 +1,11 @@
 # When bumping the C library version, reset the POST count to 0
 
-__wolfssl_version__ = "v5.1.1-stable"
+__wolfssl_version__ = "v5.3.0-stable"
 
 # We're using implicit post releases [PEP 440] to bump package version
 # while maintaining the C library version intact for better reference.
 # https://www.python.org/dev/peps/pep-0440/#implicit-post-releases
 #
 # MAJOR.MINOR.BUILD-POST
 
-__version__ = "5.1.1-0"
+__version__ = "5.3.0-0"