Commit 07044efe authored by Heikki Linnakangas's avatar Heikki Linnakangas

Remove bogus SCRAM_ITERATION_LEN constant.

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.
parent cd0cebaf
......@@ -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;
......
......@@ -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
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment