summaryrefslogtreecommitdiff
path: root/src/include/libpq
diff options
context:
space:
mode:
authorHeikki Linnakangas2017-04-18 11:50:50 +0000
committerHeikki Linnakangas2017-04-18 11:50:50 +0000
commitc727f120ff50f624a1ee3abe700d995c18314a0b (patch)
treea3fb2b94b43e51f386d31dca2b056d004b787ae3 /src/include/libpq
parent123aaffb5b881f3dadaac676877a90b50233a847 (diff)
Rename "scram" to "scram-sha-256" in pg_hba.conf and password_encryption.
Per discussion, plain "scram" is confusing because we actually implement SCRAM-SHA-256 rather than the original SCRAM that uses SHA-1 as the hash algorithm. If we add support for SCRAM-SHA-512 or some other mechanism in the SCRAM family in the future, that would become even more confusing. Most of the internal files and functions still use just "scram" as a shorthand for SCRMA-SHA-256, but I did change PASSWORD_TYPE_SCRAM to PASSWORD_TYPE_SCRAM_SHA_256, as that could potentially be used by 3rd party extensions that hook into the password-check hook. Michael Paquier did this in an earlier version of the SCRAM patch set already, but I didn't include that in the version that was committed. Discussion: https://www.postgresql.org/message-id/fde71ff1-5858-90c8-99a9-1c2427e7bafb@iki.fi
Diffstat (limited to 'src/include/libpq')
-rw-r--r--src/include/libpq/crypt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index 3b5da69b087..63724f39ee2 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -25,7 +25,7 @@ typedef enum PasswordType
{
PASSWORD_TYPE_PLAINTEXT = 0,
PASSWORD_TYPE_MD5,
- PASSWORD_TYPE_SCRAM
+ PASSWORD_TYPE_SCRAM_SHA_256
} PasswordType;
extern PasswordType get_password_type(const char *shadow_pass);