Fix test "NUL byte in text decrypt" for --without-zlib builds.

Backpatch-through: 14
Security: CVE-2026-2006

diff --git a/contrib/pgcrypto/expected/pgp-decrypt.out b/contrib/pgcrypto/expected/pgp-decrypt.out
index f15cf923fb62adb75ff2f8aae2ef1d8b6493c2e4..a1dd7586f7b761176f916af8e7b97fb6218ca3be 100644 (file)
--- a/contrib/pgcrypto/expected/pgp-decrypt.out
+++ b/contrib/pgcrypto/expected/pgp-decrypt.out
@@ -394,7 +394,8 @@ select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
 NOTICE:  dbg: parse_literal_data: data type=b
 ERROR:  Not text data
 -- NUL byte in text decrypt.  Ciphertext source:
--- printf 'a\x00\xc' | gpg --homedir /nonexistent --textmode \
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
 --      --personal-cipher-preferences aes --no-emit-version --batch \
 --      --symmetric --passphrase key --armor
 do $$
@@ -402,9 +403,9 @@ begin
   perform pgp_sym_decrypt(dearmor('
 -----BEGIN PGP MESSAGE-----
 
-jA0EBwMCLd9OvySmZNZg0jgBe7vGTmnje5HGXI+zsIQ99WPZu4Zs/P6pQcZ+HZ4n
-SZQHOfE8tagjB6Rqow82QpSBiOfWn4qjhQ==
-=c2cz
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
 -----END PGP MESSAGE-----
 '), 'key', 'debug=1');
 exception when others then

diff --git a/contrib/pgcrypto/expected/pgp-decrypt_1.out b/contrib/pgcrypto/expected/pgp-decrypt_1.out
index 2d21216930d4d21dfd0ed2cbc8009e0f9aa1d4b4..7bcf32ec5414efec8a4773462a29f6e8f683b995 100644 (file)
--- a/contrib/pgcrypto/expected/pgp-decrypt_1.out
+++ b/contrib/pgcrypto/expected/pgp-decrypt_1.out
@@ -390,7 +390,8 @@ select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
 NOTICE:  dbg: parse_literal_data: data type=b
 ERROR:  Not text data
 -- NUL byte in text decrypt.  Ciphertext source:
--- printf 'a\x00\xc' | gpg --homedir /nonexistent --textmode \
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
 --      --personal-cipher-preferences aes --no-emit-version --batch \
 --      --symmetric --passphrase key --armor
 do $$
@@ -398,9 +399,9 @@ begin
   perform pgp_sym_decrypt(dearmor('
 -----BEGIN PGP MESSAGE-----
 
-jA0EBwMCLd9OvySmZNZg0jgBe7vGTmnje5HGXI+zsIQ99WPZu4Zs/P6pQcZ+HZ4n
-SZQHOfE8tagjB6Rqow82QpSBiOfWn4qjhQ==
-=c2cz
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
 -----END PGP MESSAGE-----
 '), 'key', 'debug=1');
 exception when others then

diff --git a/contrib/pgcrypto/sql/pgp-decrypt.sql b/contrib/pgcrypto/sql/pgp-decrypt.sql
index 20871c76520d051781ead50896b77f3f9373ea6c..4901ab66539649a086d08515eeb308ac6dc00cd6 100644 (file)
--- a/contrib/pgcrypto/sql/pgp-decrypt.sql
+++ b/contrib/pgcrypto/sql/pgp-decrypt.sql
@@ -289,7 +289,8 @@ VsxxqLSPzNLAeIspJk5G
 select pgp_sym_decrypt(pgp_sym_encrypt_bytea('P', 'key'), 'key', 'debug=1');
 
 -- NUL byte in text decrypt.  Ciphertext source:
--- printf 'a\x00\xc' | gpg --homedir /nonexistent --textmode \
+-- printf 'a\x00\xc' | gpg --homedir /nonexistent \
+--      --personal-compress-preferences uncompressed --textmode \
 --      --personal-cipher-preferences aes --no-emit-version --batch \
 --      --symmetric --passphrase key --armor
 do $$
@@ -297,9 +298,9 @@ begin
   perform pgp_sym_decrypt(dearmor('
 -----BEGIN PGP MESSAGE-----
 
-jA0EBwMCLd9OvySmZNZg0jgBe7vGTmnje5HGXI+zsIQ99WPZu4Zs/P6pQcZ+HZ4n
-SZQHOfE8tagjB6Rqow82QpSBiOfWn4qjhQ==
-=c2cz
+jA0EBwMCXLc8pozB10Fg0jQBVUID59TLvWutJp0j6eh9ZgjqIRzdYaIymFB8y4XH
+vu0YlJP5D5BX7yqZ+Pry7TlDmiFO
+=rV7z
 -----END PGP MESSAGE-----
 '), 'key', 'debug=1');
 exception when others then