diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/libpq/crypt.h | 3 | ||||
| -rw-r--r-- | src/include/libpq/libpq-be.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index 86b9f2497c5..bec71ca168b 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -26,7 +26,8 @@ extern int md5_crypt_verify(const Port *port, const char *user, const char *pgpa extern bool md5_hash(const void *buff, size_t len, char *hexsum); extern bool CheckMD5Pwd(char *passwd, char *storedpwd, char *seed); -extern bool EncryptMD5(const char *passwd, const char *salt, char *buf); +extern bool EncryptMD5(const char *passwd, const char *salt, + size_t salt_len, char *buf); #define MD5_PASSWD_LEN 35 diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 1d4f9d06b0b..56e6443cb7f 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.21 2001/01/24 19:43:24 momjian Exp $ + * $Id: libpq-be.h,v 1.22 2001/08/17 02:59:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ typedef struct ErrorMessagePacket typedef struct AuthRequestPacket { - char data[1 + sizeof(AuthRequest) + 2]; /* 'R' + the request + + char data[1 + sizeof(AuthRequest) + 4]; /* 'R' + the request + * optional salt. */ } AuthRequestPacket; @@ -119,7 +119,8 @@ typedef struct Port Packet pktInfo; /* For the packet handlers */ SockAddr laddr; /* local addr (us) */ SockAddr raddr; /* remote addr (them) */ - char salt[2]; /* Password salt */ + char md5Salt[4]; /* Password salt */ + char cryptSalt[2]; /* Password salt */ /* * Information that needs to be held during the fe/be authentication |