From 38d485fdaa5739627b642303cc172acc1487b90a Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 30 Jan 2018 16:50:30 -0500 Subject: Fix up references to scram-sha-256 pg_hba_file_rules erroneously reported this as scram-sha256. Fix that. To avoid future errors and confusion, also adjust documentation links and internal symbols to have a separator between "sha" and "256". Reported-by: Christophe Courtois Author: Michael Paquier --- src/backend/libpq/auth.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/backend/libpq/auth.c') diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 746d7cbb8ad..3014b17a7c1 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -894,18 +894,18 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail) * channel-binding variants go first, if they are supported. Channel * binding is only supported in SSL builds. */ - sasl_mechs = palloc(strlen(SCRAM_SHA256_PLUS_NAME) + - strlen(SCRAM_SHA256_NAME) + 3); + sasl_mechs = palloc(strlen(SCRAM_SHA_256_PLUS_NAME) + + strlen(SCRAM_SHA_256_NAME) + 3); p = sasl_mechs; if (port->ssl_in_use) { - strcpy(p, SCRAM_SHA256_PLUS_NAME); - p += strlen(SCRAM_SHA256_PLUS_NAME) + 1; + strcpy(p, SCRAM_SHA_256_PLUS_NAME); + p += strlen(SCRAM_SHA_256_PLUS_NAME) + 1; } - strcpy(p, SCRAM_SHA256_NAME); - p += strlen(SCRAM_SHA256_NAME) + 1; + strcpy(p, SCRAM_SHA_256_NAME); + p += strlen(SCRAM_SHA_256_NAME) + 1; /* Put another '\0' to mark that list is finished. */ p[0] = '\0'; @@ -973,8 +973,8 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail) const char *selected_mech; selected_mech = pq_getmsgrawstring(&buf); - if (strcmp(selected_mech, SCRAM_SHA256_NAME) != 0 && - strcmp(selected_mech, SCRAM_SHA256_PLUS_NAME) != 0) + if (strcmp(selected_mech, SCRAM_SHA_256_NAME) != 0 && + strcmp(selected_mech, SCRAM_SHA_256_PLUS_NAME) != 0) { ereport(ERROR, (errcode(ERRCODE_PROTOCOL_VIOLATION), -- cgit v1.2.3