summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorBruce Momjian2001-08-15 21:08:21 +0000
committerBruce Momjian2001-08-15 21:08:21 +0000
commitd4fb1b23882401fd5c2c313f22033d3e006fad4e (patch)
tree0c9ba407cffe37ada6290a335520494665dc61e6 /src/include
parentb5b0ce2bb7bad2ec05d84c9e0cfbdbcef2ad5851 (diff)
Move md5.h contents to crypt.h.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/libpq/crypt.h9
-rw-r--r--src/include/libpq/md5.h21
2 files changed, 9 insertions, 21 deletions
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index 030921c254b..86b9f2497c5 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -24,4 +24,13 @@ extern char *crypt_getpwdreloadfilename(void);
extern int md5_crypt_verify(const Port *port, const char *user, const char *pgpass);
+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);
+
+#define MD5_PASSWD_LEN 35
+
+#define isMD5(passwd) (strncmp((passwd),"md5",3) == 0 && \
+ strlen(passwd) == MD5_PASSWD_LEN)
+
#endif
diff --git a/src/include/libpq/md5.h b/src/include/libpq/md5.h
deleted file mode 100644
index c30ad0ce61a..00000000000
--- a/src/include/libpq/md5.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * md5.h
- * Interface to hba.c
- *
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_MD5_H
-#define PG_MD5_H
-
-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);
-
-#define MD5_PASSWD_LEN 35
-
-#define isMD5(passwd) (strncmp((passwd),"md5",3) == 0 && \
- strlen(passwd) == MD5_PASSWD_LEN)
-
-#endif