-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
GHA/windows: add gssapi to openssl job #15549
Conversation
It fail, and I am not sure if it intended:
|
Can you test it with #15564? |
0360ede
to
ba1c881
Compare
I rebase over your branch. |
It solve the |
There is something funny going on when trying and failing to detect Can you also apply #15545? It may help avoiding some warnings, and perhaps this, and perhaps-perhaps the detection above:
https://github.com/curl/curl/actions/runs/11819947642/job/32931130624?pr=15549#step:7:690 This still leaves a bunch of other issues though. |
ba1c881
to
242280c
Compare
I rebease over your other branch. It solve many problems. |
It fixed the detection and some of the warnings with it. Reduced to this now:
I don't understand which type is wrong. There is a sockindex (int) and
|
krb5 defines `strtok_r` for Windows unconditionally in its public header: https://github.com/krb5/krb5/blob/dc5554394e5a4363b3e109623edbeb9ad6c18a62/src/include/win-mac.h#L214-L215 resulting in this warning: ``` lib\strtok.h(31,9): warning C4005: 'strtok_r': macro redefinition C:\vcpkg\installed\x64-windows\include\win-mac.h(215,9): see previous definition of 'strtok_r' ``` The krb5 macro collides with curl's internal definition, in case the `strtok_r` function is undetected and falling back to a local replacement. Reported-by: Tal Regev Bug: #15549 (comment) Closes #15564
@talregev Would you mind opening an issue with the int/socket confusion warnings? To give it visibility. |
242280c
to
ec891cc
Compare
I disable warning as errors to see what happen next. |
0885e33
to
ed89403
Compare
ed89403
to
8995b1d
Compare
Add gssapi to openssl job waiting for: - [x] curl#15564 - [x] curl#15545 Closes curl#15549
Add gssapi to openssl job waiting for: - [x] curl#15564 - [x] curl#15545 Closes curl#15549
Add gssapi to openssl job waiting for: - [x] curl#15564 - [x] curl#15545 Closes curl#15549
Add gssapi to openssl job waiting for: - [x] curl#15564 - [x] curl#15545 Closes curl#15549
Add gssapi to openssl job waiting for: - [x] curl#15564 - [x] curl#15545 Closes curl#15549
- fix socket/sockindex confusion on writes: The callstack used to end with `Curl_write_plain()` accepting a socket till 7.87.0. This call got swapped for `Curl_conn_send()`, expecting a sockindex. `socket_write()` was updated accordingly. Its callers missed it and continued operating on sockets: `do_sec_send()`, `sec_write()`, passing it down the stack and `Curl_conn_send()` resolving it as if it were a sockindex. It affected FTP Kerberos authentication. Discovered through MSVC warnings: ``` curl\lib\krb5.c(652,28): warning C4244: 'function': conversion from 'curl_socket_t' to 'int', possible loss of data curl\lib\krb5.c(654,28): warning C4244: 'function': conversion from 'curl_socket_t' to 'int', possible loss of data curl\lib\krb5.c(656,26): warning C4244: 'function': conversion from 'curl_socket_t' to 'int', possible loss of data curl\lib\krb5.c(657,26): warning C4244: 'function': conversion from 'curl_socket_t' to 'int', possible loss of data curl\lib\krb5.c(665,24): warning C4244: 'function': conversion from 'curl_socket_t' to 'int', possible loss of data curl\lib\krb5.c(666,24): warning C4244: 'function': conversion from 'curl_socket_t' to 'int', possible loss of data ``` Ref: https://github.com/curl/curl/actions/runs/11846599621/job/33014592805#step:9:32 Follow-up to 5651a36 #10280 Bug: #15549 (comment) Fixes #15582 - fix uninitialized buffer: ``` curl\lib\krb5.c(288,1): warning C4701: potentially uninitialized local variable '_gssresp' used ``` Ref: https://github.com/curl/curl/actions/runs/11848626645/job/33020501026?pr=15585#step:9:31 - silence unreachable code compiler warning: ``` curl\lib\krb5.c(370,1): warning C4702: unreachable code ``` Ref: https://github.com/curl/curl/actions/runs/11848626645/job/33020501026?pr=15585#step:9:30 Closes #15585
Thanks @talregev! I merged this separately and pushed in batch together with last round of fixes. |
Add gssapi to openssl job
Ref: #15545
Ref: #15564
Ref: #15585