Refactor SCRAM code to dynamically handle hash type and key length
1 patchset tracked - current t47099_7
v7t47099_7posted Dec 20, 2022tests failedwon't retryancient 4ypg 16
baseb3bb7d12a Dec 19, 2022 - 1370 days / 10274 commits behind master (from history)
applyapplied Aug 18, 15:26
rebaselast tried Aug 18, 15:26 on 195e8e427
Applying: WIP SCRAM-SHA-512 Using index info to reconstruct a base tree... M src/backend/libpq/auth-scram.c M src/backend/libpq/auth.c M src/backend/libpq/crypt.c M src/backend/libpq/hba.c M src/backend/utils/misc/guc_tables.c M src/common/scram-common.c M src/include/common/scram-common.h M src/include/libpq/crypt.h M src/include/libpq/hba.h M src/include/libpq/scram.h M src/interfaces/libpq/fe-auth-scram.c M src/interfaces/libpq/fe-auth.c M src/interfaces/libpq/fe-auth.h M src/test/authentication/t/001_password.pl Falling back to patching base and 3-way merge... Auto-merging src/test/authentication/t/001_password.pl CONFLICT (content): Merge conflict in src/test/authentication/t/001_password.pl Auto-merging src/interfaces/libpq/fe-auth.h CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-auth.h Auto-merging src/interfaces/libpq/fe-auth.c CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-auth.c Auto-merging src/interfaces/libpq/fe-auth-scram.c CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-auth-scram.c Auto-merging src/include/libpq/scram.h Auto-merging src/include/libpq/hba.h Auto-merging src/include/libpq/crypt.h CONFLICT (content): Merge conflict in src/include/libpq/crypt.h Auto-merging src/include/common/scram-common.h Auto-merging src/common/scram-common.c Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/libpq/hba.c Auto-merging src/backend/libpq/crypt.c CONFLICT (content): Merge conflict in src/backend/libpq/crypt.c Auto-merging src/backend/libpq/auth.c Auto-merging src/backend/libpq/auth-scram.c CONFLICT (content): Merge conflict in src/backend/libpq/auth-scram.c Patch failed at 0001 WIP SCRAM-SHA-512 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/test/authentication/t/001_password.pl, src/interfaces/libpq/fe-auth.h, src/interfaces/libpq/fe-auth.c, src/interfaces/libpq/fe-auth-scram.c, src/include/libpq/crypt.h, src/backend/libpq/crypt.c, src/backend/libpq/auth-scram.c
pushAug 18, 15:26 -> c2b965320branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| tests failed | 1 | 16 | 599 / 602 | 2m 47s / 2m 15s | docker run ... :t47099 | Aug 18, 15:37 |
run 32154465515failed: regress/password, tap/002_pg_upgrade, pg_upgrade/002_pg_upgrade executed 602 - ccache 213 hit / 4338 miss - head c2b965320 - digest sha256:b60a711168f0b3... - run 32154465515 | ||||||