Skip to content

[release/2.1] make chacha optional on Linux #3492

Merged
nibanks merged 6 commits intomicrosoft:release/2.1from
wfurt:21chacha
Mar 16, 2023
Merged

[release/2.1] make chacha optional on Linux #3492
nibanks merged 6 commits intomicrosoft:release/2.1from
wfurt:21chacha

Conversation

@wfurt
Copy link
Member

@wfurt wfurt commented Mar 10, 2023

backport of two changes to load msquic on Centos 7 and Mariner Linux 2.0

fixes #3422

@wfurt wfurt requested a review from a team as a code owner March 10, 2023 19:59
nibanks
nibanks previously approved these changes Mar 11, 2023
@nibanks
Copy link
Collaborator

nibanks commented Mar 11, 2023

Cargo build is failing for some reason?

  D:\a\msquic\msquic\src\platform\crypt_openssl.c(121,20): error C2065: 'true': undeclared identifier [D:\a\msquic\msquic\target\debug\build\msquic-6412ad5b29775110\out\build\src\platform\platform.vcxproj]
  D:\a\msquic\msquic\src\platform\crypt_openssl.c(121,16): warning C4244: 'return': conversion from 'int' to 'BOOLEAN', possible loss of data [D:\a\msquic\msquic\target\debug\build\msquic-6412ad5b29775110\out\build\src\platform\platform.vcxproj]
  D:\a\msquic\msquic\src\platform\crypt_openssl.c(123,20): error C2065: 'true': undeclared identifier [D:\a\msquic\msquic\target\debug\build\msquic-6412ad5b29775110\out\build\src\platform\platform.vcxproj]
  D:\a\msquic\msquic\src\platform\crypt_openssl.c(123,16): warning C4244: 'return': conversion from 'int' to 'BOOLEAN', possible loss of data [D:\a\msquic\msquic\target\debug\build\msquic-6412ad5b29775110\out\build\src\platform\platform.vcxproj]

@nibanks
Copy link
Collaborator

nibanks commented Mar 14, 2023

##[error][03/11/2023 19:57:29] CryptTest.WellKnownChaChaPolyv1 failed:
Note: Google Test filter = CryptTest.WellKnownChaChaPolyv1
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from CryptTest
[ RUN      ] CryptTest.WellKnownChaChaPolyv1
/home/vsts/work/1/s/src/platform/unittest/CryptTest.cpp:307: Failure
Value of: ((int)(QuicPacketKeyDerive(QUIC_PACKET_KEY_1_RTT, &Labels, &Secret, "WellKnownChaChaPoly", 1, &PacketKey)) <= 0)
  Actual: false
Expected: true
[  FAILED  ] CryptTest.WellKnownChaChaPolyv1 (0 ms)
[----------] 1 test from CryptTest (0 ms total)

@wfurt
Copy link
Member Author

wfurt commented Mar 14, 2023

I'll take a look.

@wfurt
Copy link
Member Author

wfurt commented Mar 15, 2023

It seems like 2.1 did not call CxPlatCryptInitialize like 2.2 does. The test should be OK now @nibanks
Windows XDP failures seems unrelated.

@nibanks
Copy link
Collaborator

nibanks commented Mar 15, 2023

It seems like 2.1 did not call CxPlatCryptInitialize like 2.2 does. The test should be OK now @nibanks Windows XDP failures seems unrelated.

I agree XDP is unrelated, and not very reliable on 2.1 builds (but is preview anyways).

I was looking at the code and noticed a call to unitialized was not added, and then saw that uninitialize doesn't do anything. Shouldn't it be cleaning up stuff?

@nibanks nibanks merged commit c6931cb into microsoft:release/2.1 Mar 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants