Enable AES-CTR, Camellia, and IPv6 SAN tests on Windows

- Fix AES-CTR version check from > to >= 0x05009000
- Add HAVE_CAMELLIA to Windows user_settings.h
- Override XINET_PTON to use InetPtonA (narrow-string) instead of
  wolfSSL's default which incorrectly casts char* to PCWSTR
- Remove IPv6 SAN test skips now that InetPtonA works correctly

Author: julek-wolfssl

ide/winvs/user_settings.h

@@ -10,6 +10,10 @@
 #define NO_MULTIBYTE_PRINT
 #define WC_NO_HARDEN
 
+/* wolfSSL's default Windows XINET_PTON casts to PCWSTR which breaks
+ * with narrow char* strings.  Use the narrow-string InetPtonA instead. */
+#define XINET_PTON(a,b,c) InetPtonA((a),(b),(c))
+
 #define WOLFSSL_KEY_GEN
 #define WOLFSSL_CERT_GEN
 #define WOLFSSL_CERT_REQ
@@ -20,6 +24,7 @@
 #define WOLFSSL_AES_COUNTER
 #define WOLFSSL_AES_DIRECT
 #define HAVE_AESGCM
+#define HAVE_CAMELLIA
 #define WOLFSSL_SHA224
 #define WOLFSSL_SHA384
 #define WOLFSSL_SHA512

src/tools/clu_funcs.c

@@ -220,7 +220,7 @@ void wolfCLU_verboseHelp(void)
     WOLFCLU_LOG(WOLFCLU_L0, "aes-cbc-128\t\taes-cbc-192\t\taes-cbc-256");
 #endif
 #if defined(WOLFSSL_AES_COUNTER) && \
-    LIBWOLFSSL_VERSION_HEX > 0x05009000
+    LIBWOLFSSL_VERSION_HEX >= 0x05009000
     WOLFCLU_LOG(WOLFCLU_L0, "aes-ctr-128\t\taes-ctr-192\t\taes-ctr-256");
 #endif
 #ifndef NO_DES3
@@ -255,7 +255,7 @@ void wolfCLU_encryptHelp(void)
     WOLFCLU_LOG(WOLFCLU_L0, "aes-cbc-128\t\taes-cbc-192\t\taes-cbc-256");
 #endif
 #if defined(WOLFSSL_AES_COUNTER) && \
-    LIBWOLFSSL_VERSION_HEX > 0x05009000
+    LIBWOLFSSL_VERSION_HEX >= 0x05009000
     WOLFCLU_LOG(WOLFCLU_L0, "aes-ctr-128\t\taes-ctr-192\t\taes-ctr-256");
 #endif
 #ifndef NO_DES3
@@ -302,7 +302,7 @@ void wolfCLU_decryptHelp(void)
     WOLFCLU_LOG(WOLFCLU_L0, "aes-cbc-128\t\taes-cbc-192\t\taes-cbc-256");
 #endif
 #if defined(WOLFSSL_AES_COUNTER) && \
-    LIBWOLFSSL_VERSION_HEX > 0x05009000
+    LIBWOLFSSL_VERSION_HEX >= 0x05009000
     WOLFCLU_LOG(WOLFCLU_L0, "aes-ctr-128\t\taes-ctr-192\t\taes-ctr-256");
 #endif
 #ifndef NO_DES3

tests/x509/x509-req-test.py

@@ -197,8 +197,8 @@ def test_req_extensions_not_found_fails(self):
         self.assertNotEqual(r.returncode, 0)
 
 
-    @unittest.skipIf(sys.platform == "win32",
-                      "wolfSSL IPv6 SAN parsing fails on Windows")
+
+
     def test_req_extensions_v3_alt_ca(self):
         """req with v3_alt_ca extensions sets CA:TRUE."""
         alt_crt = _tmp("test_req_alt.crt")
@@ -389,8 +389,8 @@ def _clean(self, *files):
         for f in files:
             self.addCleanup(lambda p=f: _cleanup(p))
 
-    @unittest.skipIf(sys.platform == "win32",
-                      "wolfSSL IPv6 SAN parsing fails on Windows")
+
+
     def test_extfile_v3_alt_ca(self):
         """x509 -req with -extfile and -extensions v3_alt_ca sets CA:TRUE."""
         out = _tmp("tmp_ext.cert")
@@ -592,8 +592,8 @@ def setUpClass(cls):
     def tearDownClass(cls):
         _cleanup(cls.conf_file)
 
-    @unittest.skipIf(sys.platform == "win32",
-                      "wolfSSL IPv6 SAN parsing fails on Windows")
+
+
     def test_v3_alt_req_full_tenthname(self):
         """req with v3_alt_req_full includes tenthName."""
         tmp = _tmp("test_req_altfull.cert")