NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9cb5518

committed

Clean up error message reported after \password encryption failure.

Experimenting with FIPS mode enabled, I sawregression=# \password joeEnter new password for user "joe":Enter it again:could not encrypt password: disabled for FIPSout of memorybecause PQencryptPasswordConn was still of the opinion that "out ofmemory" is always appropriate to print.Minor oversight inb69aba7. Like that one, back-patch to v14.

1 parent790fbda commit9cb5518Copy full SHA for 9cb5518

File tree

1 file changed

-4

lines changed

src/interfaces/libpq
- fe-auth.c

1 file changed

-4

lines changed

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

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1290,6 +1290,10 @@ PQencryptPasswordConn(PGconn conn, const char passwd, const char *user,`
`1290`	`1290`	`if (strcmp(algorithm,"scram-sha-256")==0)`
`1291`	`1291`	`{`
`1292`	`1292`	`crypt_pwd=pg_fe_scram_build_secret(passwd);`
	`1293`	`+/* We assume the only possible failure is OOM */`
	`1294`	`+if (!crypt_pwd)`
	`1295`	`+appendPQExpBufferStr(&conn->errorMessage,`
	`1296`	`+libpq_gettext("out of memory\n"));`
`1293`	`1297`	`}`
`1294`	`1298`	`elseif (strcmp(algorithm,"md5")==0)`
`1295`	`1299`	`{`
`@@ -1307,6 +1311,9 @@ PQencryptPasswordConn(PGconn conn, const char passwd, const char *user,`
`1307`	`1311`	`crypt_pwd=NULL;`
`1308`	`1312`	`}`
`1309`	`1313`	`}`
	`1314`	`+else`
	`1315`	`+appendPQExpBufferStr(&conn->errorMessage,`
	`1316`	`+libpq_gettext("out of memory\n"));`
`1310`	`1317`	`}`
`1311`	`1318`	`else`
`1312`	`1319`	`{`
`@@ -1316,9 +1323,5 @@ PQencryptPasswordConn(PGconn conn, const char passwd, const char *user,`
`1316`	`1323`	`returnNULL;`
`1317`	`1324`	`}`
`1318`	`1325`
`1319`		`-if (!crypt_pwd)`
`1320`		`-appendPQExpBufferStr(&conn->errorMessage,`
`1321`		`-libpq_gettext("out of memory\n"));`
`1322`		`-`
`1323`	`1326`	`returncrypt_pwd;`
`1324`	`1327`	`}`

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!

Commit9cb5518

File tree

1 file changed

1 file changed

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

0 commit comments