NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitfa87870

committed

Refactor RandomSalt to handle salts of different lengths.

All we need is 4 bytes at the moment, for MD5 authentication. But inupcomint patches for SCRAM authentication, SCRAM will need a salt ofdifferent length. It's less scary for the caller to pass the bufferlength anyway, than assume a certain-sized output buffer.Author: Michael PaquierDiscussion: <CAB7nPqQvO4sxLFeS9D+NM3wpy08ieZdAj_6e117MQHZAfxBFsg@mail.gmail.com>

1 parenta79a685 commitfa87870Copy full SHA for fa87870

File tree

1 file changed

-11

lines changed

src/backend/postmaster
- postmaster.c

1 file changed

-11

lines changed

`‎src/backend/postmaster/postmaster.c`

Lines changed: 9 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ static intinitMasks(fd_set *rmask);`
`404`	`404`	`staticvoidreport_fork_failure_to_client(Port*port,interrnum);`
`405`	`405`	`staticCAC_statecanAcceptConnections(void);`
`406`	`406`	`staticlongPostmasterRandom(void);`
`407`		`-staticvoidRandomSalt(char*md5Salt);`
	`407`	`+staticvoidRandomSalt(char*salt,intlen);`
`408`	`408`	`staticvoidsignal_child(pid_tpid,intsignal);`
`409`	`409`	`staticboolSignalSomeChildren(intsignal,inttargets);`
`410`	`410`	`staticvoidTerminateChildren(intsignal);`
`@@ -2342,7 +2342,7 @@ ConnCreate(int serverFd)`
`2342`	`2342`	`* after. Else the postmaster's random sequence won't get advanced, and`
`2343`	`2343`	`* all backends would end up using the same salt...`
`2344`	`2344`	`*/`
`2345`		`-RandomSalt(port->md5Salt);`
	`2345`	`+RandomSalt(port->md5Salt,sizeof(port->md5Salt));`
`2346`	`2346`
`2347`	`2347`	`/*`
`2348`	`2348`	`* Allocate GSSAPI specific state struct`
`@@ -5083,23 +5083,21 @@ StartupPacketTimeoutHandler(void)`
`5083`	`5083`	`* RandomSalt`
`5084`	`5084`	`*/`
`5085`	`5085`	`staticvoid`
`5086`		`-RandomSalt(char*md5Salt)`
	`5086`	`+RandomSalt(char*salt,intlen)`
`5087`	`5087`	`{`
`5088`	`5088`	`longrand;`
	`5089`	`+inti;`
`5089`	`5090`
`5090`	`5091`	`/*`
`5091`	`5092`	`* We use % 255, sacrificing one possible byte value, so as to ensure that`
`5092`	`5093`	`* all bits of the random() value participate in the result. While at it,`
`5093`	`5094`	`* add one to avoid generating any null bytes.`
`5094`	`5095`	`*/`
`5095`		`-rand=PostmasterRandom();`
`5096`		`-md5Salt[0]= (rand %255)+1;`
`5097`		`-rand=PostmasterRandom();`
`5098`		`-md5Salt[1]= (rand %255)+1;`
`5099`		`-rand=PostmasterRandom();`
`5100`		`-md5Salt[2]= (rand %255)+1;`
`5101`		`-rand=PostmasterRandom();`
`5102`		`-md5Salt[3]= (rand %255)+1;`
	`5096`	`+for (i=0;i<len;i++)`
	`5097`	`+{`
	`5098`	`+rand=PostmasterRandom();`
	`5099`	`+salt[i]= (rand %255)+1;`
	`5100`	`+}`
`5103`	`5101`	`}`
`5104`	`5102`
`5105`	`5103`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfa87870

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/postmaster.c`

0 commit comments