mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up comments.

Browse Source
This commit is contained in:
Tom Lane 2001-09-29 19:49:50 +00:00
parent 2a314add00
commit 742d0f25c1
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/libpq/md5.c
View File

@ -10,13 +10,11 @@
* *
* Sverre H. Huseby <sverrehu@online.no> * Sverre H. Huseby <sverrehu@online.no>
* *
* $Header: /cvsroot/pgsql/src/backend/libpq/md5.c,v 1.7 2001/09/27 23:16:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/md5.c,v 1.8 2001/09/29 19:49:50 tgl Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include <errno.h>
#include "libpq/crypt.h" #include "libpq/crypt.h"
#ifdef FRONTEND #ifdef FRONTEND
@ -291,24 +289,31 @@ md5_hash(const void *buff, size_t len, char *hexsum)
/* /*
* puts md5(username+passwd) in buf provided buflen is at least 36 bytes * Computes MD5 checksum of "passwd" (a null-terminated string) followed
* returns 1 on success, 0 on any kind of failure and sets errno accordingly * by "salt" (which need not be null-terminated).
*
* Output format is "md5" followed by a 32-hex-digit MD5 checksum.
* Hence, the output buffer "buf" must be at least 36 bytes long.
*
* Returns TRUE if okay, FALSE on error (out of memory).
*/ */
bool EncryptMD5(const char *passwd, const char *salt, size_t salt_len, bool EncryptMD5(const char *passwd, const char *salt, size_t salt_len,
char *buf) char *buf)
{ {
char *crypt_buf = palloc(strlen(passwd) + salt_len); size_t passwd_len = strlen(passwd);
char *crypt_buf = palloc(passwd_len + salt_len);
bool ret; bool ret;
strcpy(buf, "md5");
/* /*
* Place salt at the end because it may be known by users * Place salt at the end because it may be known by users
* trying to crack the MD5 output. * trying to crack the MD5 output.
*/ */
strcpy(crypt_buf, passwd); strcpy(crypt_buf, passwd);
memcpy(crypt_buf+strlen(passwd), salt, salt_len); memcpy(crypt_buf+passwd_len, salt, salt_len);
strcpy(buf, "md5");
ret = md5_hash(crypt_buf, passwd_len + salt_len, buf + 3);
ret = md5_hash(crypt_buf, strlen(passwd) + salt_len, buf + 3);
pfree(crypt_buf); pfree(crypt_buf);
return ret; return ret;