Split regression tests by algorithms

This lets us use just one _1.out file per feature that isn't enabled.

Author: df7cb

Makefile

@@ -7,7 +7,7 @@ EXTENSION = pg_pwhash
 DATA = pg_pwhash--1.0.sql
 DOCS = README.md
 
-REGRESS = pgxcrypto
+REGRESS = pg_pwhash argon2 argon2_openssl scrypt yescrypt
 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)

expected/pg_pwhash_3.out expected/argon2.outexpected/pg_pwhash_3.out renamed to expected/argon2.out

@@ -1,34 +1,3 @@
-CREATE EXTENSION pg_pwhash;
---
--- Try settings for pg_pwhash.argon2_default_backend
---
--- should fail
-SET pg_pwhash.argon2_default_backend = 'blabla';
-ERROR:  invalid value for parameter "pg_pwhash.argon2_default_backend": "blabla"
-HINT:  Available values: openssl, libargon2.
--- should succeed
-SET pg_pwhash.argon2_default_backend = 'openssl';
-SHOW pg_pwhash.argon2_default_backend;
- pg_pwhash.argon2_default_backend 
-----------------------------------
- openssl
-(1 row)
-
-SET pg_pwhash.argon2_default_backend = 'libargon2';
-SHOW pg_pwhash.argon2_default_backend;
- pg_pwhash.argon2_default_backend 
-----------------------------------
- libargon2
-(1 row)
-
--- back to default
-RESET pg_pwhash.argon2_default_backend;
-SHOW pg_pwhash.argon2_default_backend;
- pg_pwhash.argon2_default_backend 
-----------------------------------
- libargon2
-(1 row)
-
 --
 -- Tests for argon2id
 --
@@ -349,191 +318,3 @@ SELECT hash = pwhash_argon2(pw, salt) FROM pwhash_test_argon2;
 
 RESET pg_pwhash.argon2_default_backend;
 DROP TABLE pwhash_test_argon2;
---
--- Checks for scrypt
---
--- The hashes we compare here are derived via python's passlib again
---
--- h = scrypt.using(salt=bytes("12345678", "utf-8")).hash("password")
---
-SELECT pwhash_scrypt('password', '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg$NuB+vs2zc0fb2UzIRwwAV6ZWb3St8+X9IedYI1gQsoo') = '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg$NuB+vs2zc0fb2UzIRwwAV6ZWb3St8+X9IedYI1gQsoo';
-ERROR:  this version of pg_pwhash was compiled without libscrypt support
---
--- Check if parameters get applied
---
--- h = scrypt.using(salt=bytes("12345678", "utf-8")).using=(rounds=8).using(block_size=16).hash("password")
---
-SELECT pwhash_scrypt('password', '$scrypt$ln=8,r=16,p=1$MTIzNDU2Nzg$tEmA9TbF8lFDbMySWVfYoEqW2ywo6Qr8vu/sHHwVyDs') = '$scrypt$ln=8,r=16,p=1$MTIzNDU2Nzg$tEmA9TbF8lFDbMySWVfYoEqW2ywo6Qr8vu/sHHwVyDs';
-ERROR:  this version of pg_pwhash was compiled without libscrypt support
---
--- Check uneven base64 salt (needs padding) and is handled according to pg_pwhash.always_pad_base64
---
--- h = scrypt.using(salt=bytes("123456789", "utf-8")).hash("password")
---
-SELECT pwhash_scrypt('password', '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg5$owI4pAfxQFH5mayb2BJed7ltHms8Z+M1JEQ/PIvuW84') = '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg5$owI4pAfxQFH5mayb2BJed7ltHms8Z+M1JEQ/PIvuW84';
-ERROR:  this version of pg_pwhash was compiled without libscrypt support
---
--- Check with crypt identifier
---
--- Should fail, since scrypt ident is expected
-SELECT pwhash_scrypt('password', '$7$ln=16,r=8,p=1$MTIzNDU2Nzg5$owI4pAfxQFH5mayb2BJed7ltHms8Z+M1JEQ/PIvuW84') = '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg5$owI4pAfxQFH5mayb2BJed7ltHms8Z+M1JEQ/PIvuW84';
-ERROR:  invalid magic byte in salt preamble, expected "$scrypt$"
--- Same, but this time with correct identifier
-SELECT pwhash_scrypt('password', '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg5$owI4pAfxQFH5mayb2BJed7ltHms8Z+M1JEQ/PIvuW84') = '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg5$owI4pAfxQFH5mayb2BJed7ltHms8Z+M1JEQ/PIvuW84';
-ERROR:  this version of pg_pwhash was compiled without libscrypt support
--- Same test, but this time with pg_pwhash.always_pad_base64 set to on (salt and password hash
--- should be padded)
-SET pg_pwhash.always_pad_base64 TO on;
-SELECT pwhash_scrypt('password', '$scrypt$ln=16,r=8,p=1$MTIzNDU=$UrgkUooL3HseyjbLegKgNKz2B/0mlHRg+ZJu6DuXK00=') = '$scrypt$ln=16,r=8,p=1$MTIzNDU=$UrgkUooL3HseyjbLegKgNKz2B/0mlHRg+ZJu6DuXK00=';
-ERROR:  this version of pg_pwhash was compiled without libscrypt support
-SET pg_pwhash.always_pad_base64 TO off;
--- should fail, options string not present
-SELECT pwhash_scrypt('password', '$scrypt$MTIzNDU=$UrgkUooL3HseyjbLegKgNKz2B/0mlHRg+ZJu6DuXK00');
-ERROR:  invalid option name: "MTIzNDU"
--- should fail, obscure option specification
-SELECT pwhash_scrypt('password', '$scrypt$M$TIzNDU=$UrgkUooL3HseyjbLegKgNKz2B/0mlHRg+ZJu6DuXK00=');
-ERROR:  bogus option specified in salt
---
--- Test crypt() implementation
---
--- Should succeed
-SELECT pwhash_scrypt_crypt('password', '$7$DU..../....OhzHZvHVazzr5gCG7jotQ0$aehDO6CrqD4ITgsiLqw3EmIYyulY/tZSF9ARYtZN4U/') = '$7$DU..../....OhzHZvHVazzr5gCG7jotQ0$aehDO6CrqD4ITgsiLqw3EmIYyulY/tZSF9ARYtZN4U/';
- ?column? 
-----------
- t
-(1 row)
-
--- Should fail, obscure salt
-SELECT pwhash_scrypt_crypt('password', '$7$abcdefghijkl');
-ERROR:  error creating password hash with crypt()
-DETAIL:  Internal error using crypt(): Invalid argument
--- -------------------------------------------------------------------------------------------------
--- Checks for yescrypt hashing
---
--- Currently this is supported on platforms with advanced libxcrypt support only (Linux, BSD).
--- So checks might fail in case support wasn't available during compilation of the extension
--- -------------------------------------------------------------------------------------------------
---
--- Compare hashes derived via test/crypt_gensalt_yescrypt password '$y$jAT$ymqO.hmB133abiOGZqA4f/'
--- (parameter rounds=6)
---
-SELECT pwhash_yescrypt_crypt('password', '$y$jAT$ymqO.hmB133abiOGZqA4f/') = '$y$jAT$ymqO.hmB133abiOGZqA4f/$ff0GrluBLpVssGRjSIYMUG2E7JWH722mSyalZT3o3E3';
- ?column? 
-----------
- t
-(1 row)
-
--- Following tests should fail
--- Note: We need lc_messages set to C, otherwise we get localized errors from libxcrypt
-SET lc_messages TO 'C';
-SELECT pwhash_yescrypt_crypt('password', '$y$');
-ERROR:  error creating password hash with crypt()
-DETAIL:  Internal error using crypt(): Invalid argument
-SELECT pwhash_yescrypt_crypt('password', '$y$$');
-ERROR:  error creating password hash with crypt()
-DETAIL:  Internal error using crypt(): Invalid argument
-SELECT pwhash_yescrypt_crypt('password', '');
-ERROR:  invalid magic string for crypt()
-RESET lc_messages;
-----------------------------------------------------------
--- Test generating yescrypt hashes with pwhash_gen_salt()
-----------------------------------------------------------
-CREATE TABLE pwhash_test_yescrypt(pw text NOT NULL, salt text NOT NULL, hash text);
-INSERT INTO pwhash_test_yescrypt(pw, salt) VALUES('password', pwhash_gen_salt('yescrypt', 'rounds=3'));
-UPDATE pwhash_test_yescrypt SET hash = pwhash_yescrypt_crypt('password', salt) WHERE pw = 'password';
-SELECT hash = pwhash_yescrypt_crypt(pw, salt) FROM pwhash_test_yescrypt;
- ?column? 
-----------
- t
-(1 row)
-
-DROP TABLE pwhash_test_yescrypt;
--- ----------------------------------------------------
--- Test crypt() compatible interface pwhash_crypt()
--- ----------------------------------------------------
---
--- scrypt via crypt()
---
-SELECT pwhash_crypt('password', '$7$DU..../....OhzHZvHVazzr5gCG7jotQ0$') = '$7$DU..../....OhzHZvHVazzr5gCG7jotQ0$aehDO6CrqD4ITgsiLqw3EmIYyulY/tZSF9ARYtZN4U/' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- scrypt via libscrypt
---
-SELECT pwhash_crypt('password', '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg$NuB+vs2zc0fb2UzIRwwAV6ZWb3St8+X9IedYI1gQsoo') = '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg$NuB+vs2zc0fb2UzIRwwAV6ZWb3St8+X9IedYI1gQsoo' AS hash;
-ERROR:  this version of pg_pwhash was compiled without libscrypt support
---
--- scrypt via OpenSSL
---
-SELECT pwhash_crypt('password', '$scrypt$ln=16,r=8,p=1,backend=openssl$MTIzNDU2Nzg$NuB+vs2zc0fb2UzIRwwAV6ZWb3St8+X9IedYI1gQsoo') = '$scrypt$ln=16,r=8,p=1$MTIzNDU2Nzg$NuB+vs2zc0fb2UzIRwwAV6ZWb3St8+X9IedYI1gQsoo' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- yescrypt via crypt()
---
-SELECT pwhash_crypt('password', '$y$jAT$ymqO.hmB133abiOGZqA4f/') = '$y$jAT$ymqO.hmB133abiOGZqA4f/$ff0GrluBLpVssGRjSIYMUG2E7JWH722mSyalZT3o3E3' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- Argon2id via libargon2
---
-SELECT pwhash_crypt('password', '$argon2id$v=19$m=65536,t=3,p=4$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4') = '$argon2id$v=19$m=65536,t=3,p=4$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- Argon2id with OpenSSL
---
-SELECT pwhash_crypt('password', '$argon2id$v=19$m=65536,t=3,p=4,backend=openssl$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4') = '$argon2id$v=19$m=65536,t=3,p=4,backend=openssl$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- Argon2d with libargon2
---
-SELECT pwhash_crypt('password', '$argon2d$v=19$m=65536,t=3,p=4$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU') = '$argon2d$v=19$m=65536,t=3,p=4$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- Argon2d with OpenSSL
---
-SELECT pwhash_crypt('password', '$argon2d$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU') = '$argon2d$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- Argon2i with libargon2
---
-SELECT pwhash_crypt('password', '$argon2i$v=19$m=65536,t=3,p=4$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A') = '$argon2i$v=19$m=65536,t=3,p=4$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A' AS hash;
- hash 
-------
- t
-(1 row)
-
---
--- Argon2i with OpenSSL
---
-SELECT pwhash_crypt('password', '$argon2i$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A') = '$argon2i$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A' AS hash;
- hash 
-------
- t
-(1 row)
-

expected/argon2_openssl.out

@@ -0,0 +1,27 @@
+--
+-- Argon2id with OpenSSL
+--
+SELECT pwhash_crypt('password', '$argon2id$v=19$m=65536,t=3,p=4,backend=openssl$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4') = '$argon2id$v=19$m=65536,t=3,p=4,backend=openssl$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4' AS hash;
+ hash 
+------
+ t
+(1 row)
+
+--
+-- Argon2d with OpenSSL
+--
+SELECT pwhash_crypt('password', '$argon2d$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU') = '$argon2d$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU' AS hash;
+ hash 
+------
+ t
+(1 row)
+
+--
+-- Argon2i with OpenSSL
+--
+SELECT pwhash_crypt('password', '$argon2i$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A') = '$argon2i$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A' AS hash;
+ hash 
+------
+ t
+(1 row)
+

expected/argon2_openssl_1.out

@@ -0,0 +1,18 @@
+--
+-- Argon2id with OpenSSL
+--
+SELECT pwhash_crypt('password', '$argon2id$v=19$m=65536,t=3,p=4,backend=openssl$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4') = '$argon2id$v=19$m=65536,t=3,p=4,backend=openssl$u9ca4zxn7H0PISSE0HqP8Q$yeN3V5sfotE6xjbD+1oBNXyF6ZkgDAlsrnJvYbOgbY4' AS hash;
+ERROR:  openssl backend not available in this version of pg_pwhash
+HINT:  This requires OpenSSL version >= 3.2.0
+--
+-- Argon2d with OpenSSL
+--
+SELECT pwhash_crypt('password', '$argon2d$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU') = '$argon2d$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$h+HoUsia1leIw6QQtzEFgergF3Ccud96oLEaS0ZOnMU' AS hash;
+ERROR:  openssl backend not available in this version of pg_pwhash
+HINT:  This requires OpenSSL version >= 3.2.0
+--
+-- Argon2i with OpenSSL
+--
+SELECT pwhash_crypt('password', '$argon2i$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A') = '$argon2i$v=19$m=65536,t=3,p=4,backend=openssl$MTIzNDU2Nzg$BvKUwNCmr7GPzmR+EyZJdBTOWvRPvaz2lNpZgWdAN3A' AS hash;
+ERROR:  openssl backend not available in this version of pg_pwhash
+HINT:  This requires OpenSSL version >= 3.2.0