mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-11 19:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove bogus SCRAM_ITERATION_LEN constant.

Browse Source 
It was not used for what the comment claimed, at all. It was actually used
as the 'base' argument to strtol(), when reading the iteration count. We
don't need a constant for base-10, so remove it.
This commit is contained in:
Heikki Linnakangas 2017-04-06 17:41:48 +03:00
parent cd0cebaf7d
commit 07044efe00
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/libpq/auth-scram.c
View File

@ -476,7 +476,7 @@ parse_scram_verifier(const char *verifier, char **salt, int *iterations,
if ((p = strtok(NULL, ":")) == NULL)
goto invalid_verifier;
errno = 0;
*iterations = strtol(p, &p, SCRAM_ITERATION_LEN);
*iterations = strtol(p, &p, 10);
if (*p || errno != 0)
goto invalid_verifier;

3
src/include/common/scram-common.h
View File

@ -31,9 +31,6 @@
/* length of salt when generating new verifiers */
#define SCRAM_SALT_LEN 10
/* number of bytes used when sending iteration number during exchange */
#define SCRAM_ITERATION_LEN 10
/* default number of iterations when generating verifier */
#define SCRAM_ITERATIONS_DEFAULT 4096

2
src/interfaces/libpq/fe-auth-scram.c
View File

@ -444,7 +444,7 @@ read_server_first_message(fe_scram_state *state, char *input,
/* read_attr_value() has generated an error string */
return false;
}
state->iterations = strtol(iterations_str, &endptr, SCRAM_ITERATION_LEN);
state->iterations = strtol(iterations_str, &endptr, 10);
if (*endptr != '\0' || state->iterations < 1)
{
printfPQExpBuffer(errormessage,