opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pgcrypto: Fix incorrect argument vs PG_GETARG*() mappings 

The following functions use a mix of bytea and text arguments, but their
C internals always used PG_GETARG_BYTEA_PP(), creating an incorrect mix
with the argument types expected by encrypt_internal():
- pgp_sym_encrypt_bytea(bytea,text[,text])
- pgp_sym_encrypt(text,text[,text])
- pgp_sym_decrypt_bytea(bytea,text[,text])
- pgp_sym_decrypt(bytea,text[,text])
- pgp_pub_encrypt_bytea(bytea,bytea[,text])
- pgp_pub_encrypt(text,bytea[,text])
- pgp_pub_decrypt_bytea(bytea, bytea[,text[,text]])
- pgp_pub_decrypt(bytea,bytea[,text[,text]])

This commit fixes the inconsistencies between the PG_GETARG*() macros
and the argument types of each function.

Both BYTEA_PP() and TEXT_PP() rely on PG_DETOAST_DATUM_PACKED(), that
returns an unaligned pointer, so this was not leading to an actual
problem as far as I know, but let's be consistent.

Author: Shihao Zhong
Discussion: https://postgr.es/m/CAGRkXqRfiWT--DzVPx_UGpNHTt0YT5Jo8eV2CtT56jNP=QpXSQ@mail.gmail.com
This commit is contained in:
Michael Paquier 2024-02-14 08:59:05 +09:00
parent f854dae888
commit d0071f9228
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
contrib/pgcrypto/pgp-pgsql.c
View File

@ -553,15 +553,15 @@ decrypt_internal(int is_pubenc, int need_text, text *data,
Datum
pgp_sym_encrypt_bytea(PG_FUNCTION_ARGS)
{
bytea *data,
*key;
bytea *data;
text *arg = NULL;
text *res;
text *res,
*key;
data = PG_GETARG_BYTEA_PP(0);
key = PG_GETARG_BYTEA_PP(1);
key = PG_GETARG_TEXT_PP(1);
if (PG_NARGS() > 2)
arg = PG_GETARG_BYTEA_PP(2);
arg = PG_GETARG_TEXT_PP(2);
res = encrypt_internal(0, 0, data, key, arg);
@ -575,15 +575,15 @@ pgp_sym_encrypt_bytea(PG_FUNCTION_ARGS)
Datum
pgp_sym_encrypt_text(PG_FUNCTION_ARGS)
{
bytea *data,
text *data,
*key;
text *arg = NULL;
text *res;
data = PG_GETARG_BYTEA_PP(0);
key = PG_GETARG_BYTEA_PP(1);
data = PG_GETARG_TEXT_PP(0);
key = PG_GETARG_TEXT_PP(1);
if (PG_NARGS() > 2)
arg = PG_GETARG_BYTEA_PP(2);
arg = PG_GETARG_TEXT_PP(2);
res = encrypt_internal(0, 1, data, key, arg);
@ -598,15 +598,15 @@ pgp_sym_encrypt_text(PG_FUNCTION_ARGS)
Datum
pgp_sym_decrypt_bytea(PG_FUNCTION_ARGS)
{
bytea *data,
*key;
bytea *data;
text *arg = NULL;
text *res;
text *res,
*key;
data = PG_GETARG_BYTEA_PP(0);
key = PG_GETARG_BYTEA_PP(1);
key = PG_GETARG_TEXT_PP(1);
if (PG_NARGS() > 2)
arg = PG_GETARG_BYTEA_PP(2);
arg = PG_GETARG_TEXT_PP(2);
res = decrypt_internal(0, 0, data, key, NULL, arg);
@ -620,15 +620,15 @@ pgp_sym_decrypt_bytea(PG_FUNCTION_ARGS)
Datum
pgp_sym_decrypt_text(PG_FUNCTION_ARGS)
{
bytea *data,
*key;
bytea *data;
text *arg = NULL;
text *res;
text *res,
*key;
data = PG_GETARG_BYTEA_PP(0);
key = PG_GETARG_BYTEA_PP(1);
key = PG_GETARG_TEXT_PP(1);
if (PG_NARGS() > 2)
arg = PG_GETARG_BYTEA_PP(2);
arg = PG_GETARG_TEXT_PP(2);
res = decrypt_internal(0, 1, data, key, NULL, arg);
@ -654,7 +654,7 @@ pgp_pub_encrypt_bytea(PG_FUNCTION_ARGS)
data = PG_GETARG_BYTEA_PP(0);
key = PG_GETARG_BYTEA_PP(1);
if (PG_NARGS() > 2)
arg = PG_GETARG_BYTEA_PP(2);
arg = PG_GETARG_TEXT_PP(2);
res = encrypt_internal(1, 0, data, key, arg);
@ -668,15 +668,15 @@ pgp_pub_encrypt_bytea(PG_FUNCTION_ARGS)
Datum
pgp_pub_encrypt_text(PG_FUNCTION_ARGS)
{
bytea *data,
*key;
bytea *key;
text *arg = NULL;
text *res;
text *res,
*data;
data = PG_GETARG_BYTEA_PP(0);
data = PG_GETARG_TEXT_PP(0);
key = PG_GETARG_BYTEA_PP(1);
if (PG_NARGS() > 2)
arg = PG_GETARG_BYTEA_PP(2);
arg = PG_GETARG_TEXT_PP(2);
res = encrypt_internal(1, 1, data, key, arg);
@ -700,9 +700,9 @@ pgp_pub_decrypt_bytea(PG_FUNCTION_ARGS)
data = PG_GETARG_BYTEA_PP(0);
key = PG_GETARG_BYTEA_PP(1);
if (PG_NARGS() > 2)
psw = PG_GETARG_BYTEA_PP(2);
psw = PG_GETARG_TEXT_PP(2);
if (PG_NARGS() > 3)
arg = PG_GETARG_BYTEA_PP(3);
arg = PG_GETARG_TEXT_PP(3);
res = decrypt_internal(1, 0, data, key, psw, arg);
@ -727,9 +727,9 @@ pgp_pub_decrypt_text(PG_FUNCTION_ARGS)
data = PG_GETARG_BYTEA_PP(0);
key = PG_GETARG_BYTEA_PP(1);
if (PG_NARGS() > 2)
psw = PG_GETARG_BYTEA_PP(2);
psw = PG_GETARG_TEXT_PP(2);
if (PG_NARGS() > 3)
arg = PG_GETARG_BYTEA_PP(3);
arg = PG_GETARG_TEXT_PP(3);
res = decrypt_internal(1, 1, data, key, psw, arg);