schannel: reclassify extra-verbose schannel_recv messages - #14826
Conversation
|
Analysis of PR #14826 at 03d9f837: Test 1540 failed, which has NOT been flaky recently, so there could be a real issue in the PR. Test 677 failed, which has NOT been flaky recently, so there could be a real issue in the PR. Generated by Testclutch |
This test failed in the Omni OS ci job and I don't see anything unexpected in the output except the return code is strange edit: oops I missed in the output that there was a crash so that explains it
another unknown error code edit: looked at this one again and don't see anything wrong in the output |
|
@vszakats do you have advice for how I should append a definition to cmake CFLAGS for a CI job, I tried So then I tried |
Yes, only the last one counts. Would this help?: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9ce3c7650..500e671f2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -171,6 +171,7 @@ jobs:
fi
[ '${{ matrix.type }}' = 'Debug' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG='
[ '${{ matrix.type }}' = 'Release' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE='
+ cflags+=' -DCURL_SCHANNEL_DEV_DEBUG'
cmake -B bld ${options} \
"-DCMAKE_C_FLAGS=${cflags}" \
"-DCMAKE_RC_COMPILE_OBJECT=${rcopts}" \
@@ -389,6 +390,7 @@ jobs:
if: ${{ matrix.build == 'cmake' }}
run: |
cmake -B bld \
+ -DCMAKE_C_FLAGS=-DCURL_SCHANNEL_DEV_DEBUG \
-DCMAKE_SYSTEM_NAME=Windows \
-DCMAKE_C_COMPILER_TARGET=${TRIPLET} \
-DCMAKE_C_COMPILER=${TRIPLET}-gcc \
@@ -502,6 +504,7 @@ jobs:
options+=" -DOPENSSL_ROOT_DIR=$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.arch }}-${{ matrix.plat }}"
fi
cmake -B bld ${options} \
+ -DCMAKE_C_FLAGS=-DCURL_SCHANNEL_DEV_DEBUG \
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \
"-DVCPKG_INSTALLED_DIR=$VCPKG_INSTALLATION_ROOT/installed" \
'-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-${{ matrix.plat }}' \ |
0ca09e9 to
413c5ff
Compare
|
@vszakats i want the define only for job 'schannel dev debug' so i changed the 'cmake configure' step to add the cflags from that particular job like this - "-DCMAKE_C_FLAGS=${cflags}" \
+ "-DCMAKE_C_FLAGS=${{ matrix.cflags }} ${cflags}" \seems to work ok let me know if you see any problem with it |
|
It looks fine to me. Maybe moving the new job one line up, and moving the ENABLE_UNICODE option before the added cmake option would make the new job line up better with existing ones, but it's just a formatting nit. |
8b972b8 to
b502ce7
Compare
|
@jay where are we on this? |
b502ce7 to
06634bc
Compare
- Create a new macro SCH_DEV() to manage verbose debug messages that are only useful for debugging Schannel recv decryption. schannel_recv contains a lot of useful debug messages to help debug the function, however in practice they are not otherwise useful and showing them in debug builds adds a lot of noise. To show these messages curl must now be built with CURL_SCHANNEL_DEV_DEBUG defined. Prior to this change many, but not all, extra-verbose messages were wrapped in DEBUGF() so they were only shown in debug builds. Ref: curl#14807 Closes #xxxxx
06634bc to
b6fd595
Compare
icing
left a comment
There was a problem hiding this comment.
Sorry, missed the mention during covid. Looks good to me, thanks!
- Create a new macro SCH_DEV() to manage verbose debug messages that are only useful for debugging Schannel recv decryption. schannel_recv contains a lot of useful debug messages to help debug the function, however in practice they are not otherwise useful and showing them in debug builds adds a lot of noise. To show these messages curl must now be built with CURL_SCHANNEL_DEV_DEBUG defined. Prior to this change many, but not all, extra-verbose messages were wrapped in DEBUGF() so they were only shown in debug builds. Ref: curl#14807 Closes curl#14826
schannel_recv contains a lot of useful debug messages to help debug the function, however in practice they are not otherwise useful and showing them in debug builds adds a lot of noise.
To show these messages curl must now be built with CURL_SCHANNEL_DEV_DEBUG defined.
Prior to this change many, but not all, extra-verbose messages were wrapped in DEBUGF() so they were only shown in debug builds.
Ref: #14807
Closes #xxxxx