Merge pull request #191 from expressvpn/enable-wolf-single-thread-opt

Enable wolf single thread opt

Author: xv-raihaan-m

3rd_party_deps.yml

@@ -16,7 +16,7 @@
       --enable-dtls-frag-ch
       --enable-dtls-mtu
       --enable-secure-renegotiation
-      --disable-singlethreaded
+      --enable-singlethreaded
       --enable-sni
       --enable-sp=yes,4096
       --enable-static

linux.yml

@@ -20,7 +20,7 @@
       :build:
         - git apply ../../wolfssl/*.patch
         - "autoreconf -i"
-        - "./configure $HE_WOLFSSL_CONF_FLAGS --prefix=$(pwd)/../builds/wolfssl_build --enable-aesni --enable-sp-asm --enable-intelasm"
+        - "./configure $HE_WOLFSSL_CONF_FLAGS $HE_WOLFSSL_ADDL_CONF_FLAGS --prefix=$(pwd)/../builds/wolfssl_build --enable-aesni --enable-sp-asm --enable-intelasm"
         - "make"
         - "make install"
       :artifacts:

linux_multithread.yml

@@ -10,3 +10,6 @@
   :arguments:
     - -latomic
 
+:environment:
+  - :HE_WOLFSSL_ADDL_CONF_FLAGS: >-
+      --disable-singlethreaded

windows.yml

@@ -10,15 +10,13 @@
     - HAVE_SECURE_RENEGOTIATION
     - WOLFSSL_DTLS_CH_FRAG
     - WOLFSSL_TLS13_MIDDLEBOX_COMPAT
-    - WOLFSSL_RW_THREADED
   :test_preprocess:
     - WOLFSSL_USER_SETTINGS
     - WOLFSSL_MIN_RSA_BITS=2048
     - WOLFSSL_MIN_ECC_BITS=256
     - HAVE_SECURE_RENEGOTIATION
     - WOLFSSL_DTLS_CH_FRAG
     - WOLFSSL_TLS_MIDDLEBOX_COMPAT
-    - WOLFSSL_RW_THREADED
     #- USE_WINDOWS_API # avoids use of unistd.h
   :release:
     - WOLFSSL_USER_SETTINGS
@@ -27,7 +25,6 @@
     - HAVE_SECURE_RENEGOTIATION
     - WOLFSSL_DTLS_CH_FRAG
     - WOLFSSL_TLS13_MIDDLEBOX_COMPAT
-    - WOLFSSL_RW_THREADED
 
 :libraries:
   :path_flag: /LIBPATH:${1}

windows/wolfssl-user_settings-32.h

@@ -1,226 +1,12 @@
 #ifndef _WIN_USER_SETTINGS_H_
 #define _WIN_USER_SETTINGS_H_
 
-/* Verify this is Windows */
-#ifndef _WIN32
-#error This user_settings.h header is only designed for Windows
-#endif
-
-/* Check HAVE_SECURE_RENEGOTIATION */
-#ifndef HAVE_SECURE_RENEGOTIATION
-#error HAVE_SECURE_RENEGOTIATION is not defined
-#endif
-
-/* Configurations */
-#undef USE_WINDOWS_API
-#define USE_WINDOWS_API
-
-#undef WOLFSSL_TLS13
-#define WOLFSSL_TLS13
-
-#undef HAVE_TLS_EXTENSIONS
-#define HAVE_TLS_EXTENSIONS
-
-#undef HAVE_SUPPORTED_CURVES
-#define HAVE_SUPPORTED_CURVES
-
-#undef WOLFSSL_DTLS_MTU
-#define WOLFSSL_DTLS_MTU
-
-#undef WOLFSSL_DTLS
-#define WOLFSSL_DTLS
-
-#undef WOLFSSL_DTLS13
-#define WOLFSSL_DTLS13
-
-#undef WOLFSSL_SEND_HRR_COOKIE
-#define WOLFSSL_SEND_HRR_COOKIE
-
-#undef SINGLE_THREADED
-
-#undef HAVE_THREAD_LS
-#define HAVE_THREAD_LS
-
-#undef TFM_TIMING_RESISTANT
-#define TFM_TIMING_RESISTANT
-
-#undef ECC_TIMING_RESISTANT
-#define ECC_TIMING_RESISTANT
-
-#undef WC_RSA_BLINDING
-#define WC_RSA_BLINDING
-
-#undef HAVE_AESGCM
-#define HAVE_AESGCM
-
 #undef WOLFSSL_AESNI
-// #define WOLFSSL_AESNI // Only works with 64-bit builds
 
 #undef HAVE_INTEL_RDSEED
-// #define HAVE_INTEL_RDSEED // Depends on IS_INTEL_RDSEED
 
 #undef USE_INTEL_SPEEDUP
-// #define USE_INTEL_SPEEDUP // Depends on 64-bit only assembly
-
-#undef WOLFSSL_SHA512
-#define WOLFSSL_SHA512
-
-#undef WOLFSSL_SHA384
-#define WOLFSSL_SHA384
-
-#undef HAVE_HKDF
-#define HAVE_HKDF
-
-#undef NO_DSA
-#define NO_DSA
-
-#undef HAVE_ECC
-#define HAVE_ECC
-
-#undef TFM_ECC256
-#define TFM_ECC256
-
-#undef ECC_SHAMIR
-#define ECC_SHAMIR
-
-#undef HAVE_CURVE25519
-#define HAVE_CURVE25519
-
-#undef NO_OLD_TLS
-#define NO_OLD_TLS
-
-#undef WC_RSA_PSS
-#define WC_RSA_PSS
-
-#undef NO_DH
-#define NO_DH
-
-#undef WOLFSSL_BASE64_ENCODE
-#define WOLFSSL_BASE64_ENCODE
-
-#undef NO_RC4
-#define NO_RC4
-
-#undef NO_HC128
-#define NO_HC128
-
-#undef NO_RABBIT
-#define NO_RABBIT
-
-#undef WOLFSSL_SHA224
-#define WOLFSSL_SHA224
-
-#undef HAVE_POLY1305
-#define HAVE_POLY1305
-
-#undef HAVE_ONE_TIME_AUTH
-#define HAVE_ONE_TIME_AUTH
-
-#undef HAVE_CHACHA
-#define HAVE_CHACHA
-
-#undef HAVE_HASHDRBG
-#define HAVE_HASHDRBG
-
-#undef HAVE_SNI
-#define HAVE_SNI
-
-#undef HAVE_SUPPORTED_CURVES
-#define HAVE_SUPPORTED_CURVES
-
-#undef HAVE_EXTENDED_MASTER
-#define HAVE_EXTENDED_MASTER
-
-#undef WOLFCRYPT_HAVE_SRP
-#define WOLFCRYPT_HAVE_SRP
-
-#undef NO_RC4
-#define NO_RC4
-
-#undef HAVE_ENCRYPT_THEN_MAC
-#define HAVE_ENCRYPT_THEN_MAC
-
-#undef NO_PSK
-#define NO_PSK
-
-#undef NO_MD4
-#define NO_MD4
-
-#undef NO_PWDBASED
-#define NO_PWDBASED
-
-#undef USE_FAST_MATH
-#define USE_FAST_MATH
 
 #undef WOLFSSL_X86_64_BUILD
-// #define WOLFSSL_X86_64_BUILD
-
-#undef WOLFSSL_HAVE_SP_RSA
-#define WOLFSSL_HAVE_SP_RSA
-
-#undef WOLFSSL_SP_4096
-#define WOLFSSL_SP_4096
-
-#undef WOLFSSL_HAVE_SP_ECC
-#define WOLFSSL_HAVE_SP_ECC
-
-#undef HAVE_ECC384
-#define HAVE_ECC384
-
-#undef WOLFSSL_SP_384
-#define WOLFSSL_SP_384
-
-#undef WOLFSSL_SP_ASM
-// #define WOLFSSL_SP_ASM
-
-#undef WOLFSSL_SP_X86_64_ASM
-// #define WOLFSSL_SP_X86_64_ASM
-
-#undef WC_NO_ASYNC_THREADING
-#define WC_NO_ASYNC_THREADING
-
-#undef HAVE_DH_DEFAULT_PARAMS
-#define HAVE_DH_DEFAULT_PARAMS
-
-#undef NO_DES3
-#define NO_DES3
-
-#undef WOLFSSL_SYS_CA_CERTS
-// #define WOLFSSL_SYS_CA_CERTS
-
-#undef HAVE_LIBOQS
-// #define HAVE_LIBOQS
-
-#undef WOLFSSL_NO_SPHINCS
-#define WOLFSSL_NO_SPHINCS
-
-#undef WOLFSSL_EXPERIMENTAL_SETTINGS
-#define WOLFSSL_EXPERIMENTAL_SETTINGS
-
-// Post-quantum settings
-#undef WOLFSSL_HAVE_KYBER
-#define WOLFSSL_HAVE_KYBER
-
-#undef WOLFSSL_WC_KYBER
-#define WOLFSSL_WC_KYBER
-
-#undef WOLFSSL_KYBER_ORIGINAL
-#define WOLFSSL_KYBER_ORIGINAL
-
-#undef WOLFSSL_NO_ML_KEM
-// #define WOLFSSL_NO_ML_KEM
-
-// Needed for using WolfSSL's Kyber implementation
-#undef WOLFSSL_SHA3
-#define WOLFSSL_SHA3
-
-#undef WOLFSSL_SHAKE128
-#define WOLFSSL_SHAKE128
-
-#undef WOLFSSL_SHAKE256
-#define WOLFSSL_SHAKE256
-
-#undef WOLFSSL_RW_THREADED
-#define WOLFSSL_RW_THREADED
 
 #endif /* _WIN_USER_SETTINGS_H_ */