Fix error detection in contrib/pgcrypto's encrypt_iv() and decrypt_iv().

Due to oversights, the encrypt_iv() and decrypt_iv() functions failed to
report certain types of invalid-input errors, and would instead return
random garbage values.

Marko Kreen, per report from Stefan Kaltenbrunner

diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index c7588532a8ec8ab02aa93e8b5afe88e4ae816850..a441ca77f124e361828ca7872b360d2a3b35a275 100644 (file)
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -341,8 +341,8 @@ pg_encrypt_iv(PG_FUNCTION_ARGS)
        err = px_combo_init(c, (uint8 *) VARDATA(key), klen,
                                                (uint8 *) VARDATA(iv), ivlen);
        if (!err)
-               px_combo_encrypt(c, (uint8 *) VARDATA(data), dlen,
-                                                (uint8 *) VARDATA(res), &rlen);
+               err = px_combo_encrypt(c, (uint8 *) VARDATA(data), dlen,
+                                                          (uint8 *) VARDATA(res), &rlen);
 
        px_combo_free(c);
 
@@ -395,8 +395,8 @@ pg_decrypt_iv(PG_FUNCTION_ARGS)
        err = px_combo_init(c, (uint8 *) VARDATA(key), klen,
                                                (uint8 *) VARDATA(iv), ivlen);
        if (!err)
-               px_combo_decrypt(c, (uint8 *) VARDATA(data), dlen,
-                                                (uint8 *) VARDATA(res), &rlen);
+               err = px_combo_decrypt(c, (uint8 *) VARDATA(data), dlen,
+                                                          (uint8 *) VARDATA(res), &rlen);
 
        px_combo_free(c);