Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit07044ef

Browse files
committed
Remove bogus SCRAM_ITERATION_LEN constant.
It was not used for what the comment claimed, at all. It was actually usedas the 'base' argument to strtol(), when reading the iteration count. Wedon't need a constant for base-10, so remove it.
1 parentcd0ceba commit07044ef

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

‎src/backend/libpq/auth-scram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ parse_scram_verifier(const char *verifier, char **salt, int *iterations,
476476
if ((p=strtok(NULL,":"))==NULL)
477477
gotoinvalid_verifier;
478478
errno=0;
479-
*iterations=strtol(p,&p,SCRAM_ITERATION_LEN);
479+
*iterations=strtol(p,&p,10);
480480
if (*p||errno!=0)
481481
gotoinvalid_verifier;
482482

‎src/include/common/scram-common.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
/* length of salt when generating new verifiers */
3232
#defineSCRAM_SALT_LEN10
3333

34-
/* number of bytes used when sending iteration number during exchange */
35-
#defineSCRAM_ITERATION_LEN10
36-
3734
/* default number of iterations when generating verifier */
3835
#defineSCRAM_ITERATIONS_DEFAULT4096
3936

‎src/interfaces/libpq/fe-auth-scram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ read_server_first_message(fe_scram_state *state, char *input,
444444
/* read_attr_value() has generated an error string */
445445
return false;
446446
}
447-
state->iterations=strtol(iterations_str,&endptr,SCRAM_ITERATION_LEN);
447+
state->iterations=strtol(iterations_str,&endptr,10);
448448
if (*endptr!='\0'||state->iterations<1)
449449
{
450450
printfPQExpBuffer(errormessage,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp