Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for building x86 in Visual Studio for non-windows OS #7884

Merged
merged 1 commit into from
Aug 23, 2024

Conversation

dgarske
Copy link
Contributor

@dgarske dgarske commented Aug 19, 2024

Description

Fixes for building x86 in Visual Studio for non-windows OS. Adds new build option WOLFSSL_NOT_WINDOWS_API for platforms where the target OS is not Windows, but compilation is done on Windows/Visual Studio.

Fixes ZD 18465

Testing

Checklist

  • added tests
  • updated/added doxygen
  • updated appropriate READMEs
  • Updated manual and documentation

@dgarske dgarske self-assigned this Aug 19, 2024
@dgarske
Copy link
Contributor Author

dgarske commented Aug 19, 2024

Retest this please. python failed on keyword "warnings", not failure.

@dgarske
Copy link
Contributor Author

dgarske commented Aug 21, 2024

Retest this please.

Python port:

FAIL: test_parse_all_sans (test.test_ssl.BasicSocketTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/workspace/PRB-python-port/osp/Python/Python-3.8.14/Lib/test/test_ssl.py", line 560, in test_parse_all_sans
    self.assertEqual(p['subjectAltName'],
AssertionError: Tuples differ: (('Re[151 chars]), ('DNS', 'allsans'), ('email', 'user@example[175 chars],)))) != (('Re[151 chars]), ('othername', '<unsupported>'), ('othername[239 chars],))))

First differing element 5:
('DNS', 'allsans')
('othername', '<unsupported>')

Second tuple contains 2 additional elements.
First extra element 8:
('email', 'user@example.org')

  (('Registered ID', 'surname'),
   ('IP Address', '0:0:0:0:0:0:0:1'),
   ('IP Address', '127.0.0.1'),
   ('URI', 'https://www.python.org/'),
   ('DNS', 'www.example.org'),
+  ('othername', '<unsupported>'),
+  ('othername', '<unsupported>'),
   ('DNS', 'allsans'),
   ('email', 'user@example.org'),
   ('DirName',
    ((('countryName', 'XY'),),
     (('localityName', 'Castle Anthrax'),),
     (('organizationName', 'Python Software Foundation'),),
     (('commonName', 'dirname example'),))))

----------------------------------------------------------------------

Ran 163 tests in 10.504s

FAILED (failures=1, skipped=18)
1 test failed again:
    test_ssl

== Tests result: FAILURE then FAILURE ==

1 test failed:
    test_ssl

1 re-run test:
    test_ssl

Total duration: 21.2 sec

@dgarske dgarske assigned wolfSSL-Bot and unassigned dgarske Aug 21, 2024
@dgarske dgarske requested a review from douzzer August 21, 2024 17:44
@dgarske
Copy link
Contributor Author

dgarske commented Aug 21, 2024

Failures are not related to this PR. @douzzer please review when you can. Thank you

@dgarske
Copy link
Contributor Author

dgarske commented Aug 22, 2024

Retest this please

2 similar comments
@dgarske
Copy link
Contributor Author

dgarske commented Aug 22, 2024

Retest this please

@dgarske
Copy link
Contributor Author

dgarske commented Aug 23, 2024

Retest this please

@douzzer douzzer merged commit a39f521 into wolfSSL:master Aug 23, 2024
125 checks passed
dgarske added a commit to dgarske/wolfssl that referenced this pull request Oct 22, 2024
…owup to PR wolfSSL#7884. Expands the `WOLFSSL_NOT_WINDOWS_API` improvement for intrinsics and word sizes. Fixes ZD 18465
dgarske added a commit to dgarske/wolfssl that referenced this pull request Oct 24, 2024
…owup to PR wolfSSL#7884. Expands the `WOLFSSL_NOT_WINDOWS_API` improvement for intrinsics and word sizes. Fixes ZD 18465
@dgarske dgarske deleted the x86_notwindows branch October 28, 2024 15:13
dgarske added a commit to dgarske/wolfssl that referenced this pull request Oct 29, 2024
…om C compiler). Followup to PR wolfSSL#7884. Fixes ZD 18465

* Consolidate the USE_WINDOWS_API to a single place.
* Expand the `WOLFSSL_NOT_WINDOWS_API` improvement for intrinsics and word sizes.
* Fix for macro variadic `...` when no variables are used (some compilers like Watcom C have issue with this).
* Fix for Watcom C compiler "long long" -> "__int64".
* Fix a couple of minor cast warnings reported from VS.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants