Remove bogus SCRAM_ITERATION_LEN constant.

hlinnaka · hlinnaka · commit 07044efe0076 · 2017-04-06T17:41:48.000+03:00
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.
diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c
@@ -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;
 
diff --git a/src/include/common/scram-common.h b/src/include/common/scram-common.h
@@ -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
 
diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ read_server_first_message(fe_scram_state state, char input,`
`444`	`444`	`/* read_attr_value() has generated an error string */`
`445`	`445`	`return false;`
`446`	`446`	`}`
`447`		`- state->iterations = strtol(iterations_str, &endptr, SCRAM_ITERATION_LEN);`
	`447`	`+ state->iterations = strtol(iterations_str, &endptr, 10);`
`448`	`448`	`if (*endptr != '\0' \|\| state->iterations < 1)`
`449`	`449`	`{`
`450`	`450`	`printfPQExpBuffer(errormessage,`