Fetch channel binding digest explicitly with OpenSSL 3.0 and later

back to CI dashboard

2 patchsets tracked - current t253328_4

v4t253328_4posted Aug 13, 01:06successwon't retryrecent 10dpg 20
basebdaad789c Aug 12, 17:15 on master
applyapplied Aug 13, 01:08
rebaselast tried Aug 14, 01:09 on 1f97b252d
Applying: Use explicit fetching of digests in channel binding (OpenSSL >= 3.0)
Using index info to reconstruct a base tree...
M	src/backend/libpq/be-secure-openssl.c
M	src/interfaces/libpq/fe-secure-openssl.c
Falling back to patching base and 3-way merge...
Auto-merging src/interfaces/libpq/fe-secure-openssl.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-secure-openssl.c
Auto-merging src/backend/libpq/be-secure-openssl.c
CONFLICT (content): Merge conflict in src/backend/libpq/be-secure-openssl.c
Patch failed at 0001 Use explicit fetching of digests in channel binding (OpenSSL >= 3.0)

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/interfaces/libpq/fe-secure-openssl.c, src/backend/libpq/be-secure-openssl.c
pushAug 13, 01:08 -> e54ca6cb7branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201019 / 10192m 55s / 5m 16sdocker run ... :t253328Aug 13, 01:23
run 31656736538
executed 1019 - ccache 165 hit / 6457 miss - head e54ca6cb7 - digest sha256:bbb55af05fe0da... - run 31656736538
v1t253328_1posted Aug 05, 20:09supersededstale 33dpg 20apply failed