postgres.git / summary / log / commit / refs

commit    22e1943f13b66df22ea4f8d15836411ba259263a
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Tue Mar 23 10:35:12 2021 +0000
First released in: 14.0

    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/can
    be disabled, this is the place where this is reported.  So we need to
    catch the error here, otherwise the higher-level functions would
    return garbage.  The nearby encryption code already handled errors
    similarly.
    
    Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
    Discussion: https://www.postgresql.org/message-id/9e9c431c-0adc-7a6d-9b1a-915de1ba3fe7@enterprisedb.com


 contrib/pgcrypto/px.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c
index a243f575d3b..4205e9c3eff 100644
--- a/contrib/pgcrypto/px.c
+++ b/contrib/pgcrypto/px.c
@@ -292,6 +292,7 @@ static int
 combo_decrypt(PX_Combo *cx, const uint8 *data, unsigned dlen,
 			  uint8 *res, unsigned *rlen)
 {
+	int			err = 0;
 	unsigned	bs,
 				i,
 				pad;
@@ -317,7 +318,9 @@ combo_decrypt(PX_Combo *cx, const uint8 *data, unsigned dlen,
 
 	/* decrypt */
 	*rlen = dlen;
-	px_cipher_decrypt(c, data, dlen, res);
+	err = px_cipher_decrypt(c, data, dlen, res);
+	if (err)
+		return err;
 
 	/* unpad */
 	if (bs > 1 && cx->padding)


[parent: a6715af1e72d]