git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Loop when necessary in contrib/pgcrypto's pktreader_pull().

2014年11月11日 22:22:15 +0000 (17:22 -0500)

This fixes a scenario in which pgp_sym_decrypt() failed with "Wrong key
or corrupt data" on messages whose length is 6 less than a power of 2.

Per bug #11905 from Connor Penhale. Fix by Marko Tiikkaja, regression
test case from Jeff Janes.

contrib/pgcrypto/expected/pgp-decrypt.out patch | blob | blame | history

contrib/pgcrypto/pgp-decrypt.c patch | blob | blame | history

contrib/pgcrypto/sql/pgp-decrypt.sql patch | blob | blame | history

diff --git a/contrib/pgcrypto/expected/pgp-decrypt.out b/contrib/pgcrypto/expected/pgp-decrypt.out

index 859f4d681b430feffe912e691e9938e140317f68..7193dca026268118898e45d8cbef873eb33c9f08 100644 (file)

--- a/contrib/pgcrypto/expected/pgp-decrypt.out

+++ b/contrib/pgcrypto/expected/pgp-decrypt.out

@@ -364,3 +364,11 @@ a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs

(1 row)

-- expected: 7efefcab38467f7484d6fa43dc86cf5281bd78e2

+-- check BUG #11905, problem with messages 6 less than a power of 2.

+select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',65530);

+ ?column?

+----------

+ t

+(1 row)

+-- expected: true

diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c

index 9aabd66e7e6e93d8ddcf0db33719eed903dddf8d..704cf2ef855d9d23e0f77e04a9688a99fda7b80b 100644 (file)

--- a/contrib/pgcrypto/pgp-decrypt.c

+++ b/contrib/pgcrypto/pgp-decrypt.c

@@ -182,7 +182,7 @@ pktreader_pull(void *priv, PullFilter *src, int len,

if (pkt->type == PKT_CONTEXT)

return pullf_read(src, len, data_p);

- if (pkt->len == 0)

+ while (pkt->len == 0)

{

/* this was last chunk in stream */

if (pkt->type == PKT_NORMAL)

diff --git a/contrib/pgcrypto/sql/pgp-decrypt.sql b/contrib/pgcrypto/sql/pgp-decrypt.sql

index 93535ab016ad7d66964846628350a9b52152dce4..5457152ccf66fa9f930195263e173222300b2c76 100644 (file)

--- a/contrib/pgcrypto/sql/pgp-decrypt.sql

+++ b/contrib/pgcrypto/sql/pgp-decrypt.sql

@@ -264,3 +264,7 @@ a3nsOzKTXUfS9VyaXo8IrncM6n7fdaXpwba/3tNsAhJG4lDv1k4g9v8Ix2dfv6Rs

-----END PGP MESSAGE-----

'), 'key', 'convert-crlf=1'), 'sha1'), 'hex');

-- expected: 7efefcab38467f7484d6fa43dc86cf5281bd78e2

+-- check BUG #11905, problem with messages 6 less than a power of 2.

+select pgp_sym_decrypt(pgp_sym_encrypt(repeat('x',65530),'1'),'1') = repeat('x',65530);

+-- expected: true

This is the main PostgreSQL git repository.

RSS Atom