database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Force crypt() salt to be null-terminated.

Browse Source
This commit is contained in:
Bruce Momjian 2001-08-17 03:09:31 +00:00
parent da45a0bdb7
commit b5453fae74
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/libpq/crypt.c
View File

@ -9,7 +9,7 @@
* Dec 17, 1997 - Todd A. Brandys * Dec 17, 1997 - Todd A. Brandys
* Orignal Version Completed. * Orignal Version Completed.
* *
* $Id: crypt.c,v 1.35 2001/08/17 02:59:19 momjian Exp $ * $Id: crypt.c,v 1.36 2001/08/17 03:09:31 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -281,7 +281,7 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
if (isMD5(passwd) && port->auth_method != uaMD5) if (isMD5(passwd) && port->auth_method != uaMD5)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"Password is stored MD5 encrypted. " "Password is stored MD5 encrypted. "
"Only pg_hba.conf's MD5 protocol can be used for this user.\n"); "Only pg_hba.conf's MD5 protocol can be used for this user.\n");
fputs(PQerrormsg, stderr); fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg); pqdebug("%s", PQerrormsg);
@ -295,8 +295,12 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass)
switch (port->auth_method) switch (port->auth_method)
{ {
case uaCrypt: case uaCrypt:
crypt_pwd = crypt(passwd, port->cryptSalt); {
char salt[3];
StrNCpy(salt, port->cryptSalt,3);
crypt_pwd = crypt(passwd, salt);
break; break;
}
case uaMD5: case uaMD5:
crypt_pwd = palloc(MD5_PASSWD_LEN+1); crypt_pwd = palloc(MD5_PASSWD_LEN+1);
if (isMD5(passwd)) if (isMD5(passwd))

9
src/interfaces/libpq/fe-auth.c
View File

@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.51 2001/08/17 02:59:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.52 2001/08/17 03:09:31 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -443,8 +443,13 @@ pg_password_sendauth(PGconn *conn, const char *password, AuthRequest areq)
switch (areq) switch (areq)
{ {
case AUTH_REQ_CRYPT: case AUTH_REQ_CRYPT:
crypt_pwd = crypt(password, conn->cryptSalt); {
char salt[3];
StrNCpy(salt, conn->cryptSalt,3);
crypt_pwd = crypt(password, salt);
break; break;
}
case AUTH_REQ_MD5: case AUTH_REQ_MD5:
{ {
char *crypt_pwd2; char *crypt_pwd2;