NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita69e150

committed

pgcrypto: Check for error return of px_cipher_decrypt()

This has previously not been a problem (that anyone ever reported),but in future OpenSSL versions (3.0.0), where legacy ciphers are/canbe disabled, this is the place where this is reported. So we need tocatch the error here, otherwise the higher-level functions wouldreturn garbage. The nearby encryption code already handled errorssimilarly.Author: Peter Eisentraut <peter@eisentraut.org>Reviewed-by: Daniel Gustafsson <daniel@yesql.se>Discussion:https://www.postgresql.org/message-id/9e9c431c-0adc-7a6d-9b1a-915de1ba3fe7@enterprisedb.comBackpatch-through: 9.6

1 parent52f8575 commita69e150Copy full SHA for a69e150

File tree

1 file changed

-1

lines changed

contrib/pgcrypto
- px.c

1 file changed

-1

lines changed

`‎contrib/pgcrypto/px.c`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ static int`
`292`	`292`	`combo_decrypt(PX_Combocx,constuint8data,unsigneddlen,`
`293`	`293`	`uint8res,unsignedrlen)`
`294`	`294`	`{`
	`295`	`+interr=0;`
`295`	`296`	`unsignedbs,`
`296`	`297`	`i,`
`297`	`298`	`pad;`
`@@ -317,7 +318,9 @@ combo_decrypt(PX_Combo cx, const uint8 data, unsigned dlen,`
`317`	`318`
`318`	`319`	`/* decrypt */`
`319`	`320`	`*rlen=dlen;`
`320`		`-px_cipher_decrypt(c,data,dlen,res);`
	`321`	`+err=px_cipher_decrypt(c,data,dlen,res);`
	`322`	`+if (err)`
	`323`	`+returnerr;`
`321`	`324`
`322`	`325`	`/* unpad */`
`323`	`326`	`if (bs>1&&cx->padding)`

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!

Commita69e150

File tree

1 file changed

1 file changed

`‎contrib/pgcrypto/px.c`

0 commit comments