From d4fb1b23882401fd5c2c313f22033d3e006fad4e Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 15 Aug 2001 21:08:21 +0000 Subject: [PATCH] Move md5.h contents to crypt.h. --- src/backend/commands/user.c | 3 +-- src/backend/libpq/crypt.c | 3 +-- src/backend/libpq/md5.c | 4 ++-- src/include/libpq/crypt.h | 9 +++++++++ src/include/libpq/md5.h | 21 --------------------- src/interfaces/libpq/Makefile | 7 ++----- src/interfaces/libpq/fe-auth.c | 4 ++-- 7 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 src/include/libpq/md5.h diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 7f62b19928..3b730a3a0d 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.80 2001/08/15 18:42:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.81 2001/08/15 21:08:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,6 @@ #include "catalog/indexing.h" #include "commands/user.h" #include "libpq/crypt.h" -#include "libpq/md5.h" #include "miscadmin.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index 62393d26e0..a08c4f6baa 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -9,7 +9,7 @@ * Dec 17, 1997 - Todd A. Brandys * Orignal Version Completed. * - * $Id: crypt.c,v 1.33 2001/08/15 18:42:14 momjian Exp $ + * $Id: crypt.c,v 1.34 2001/08/15 21:08:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,6 @@ #include "postgres.h" #include "libpq/crypt.h" -#include "libpq/md5.h" #include "miscadmin.h" #include "storage/fd.h" #include "utils/nabstime.h" diff --git a/src/backend/libpq/md5.c b/src/backend/libpq/md5.c index 20392fb4e7..4412744249 100644 --- a/src/backend/libpq/md5.c +++ b/src/backend/libpq/md5.c @@ -18,7 +18,7 @@ #include #include "postgres.h" -#include "libpq/md5.h" +#include "libpq/crypt.h" /* * PRIVATE FUNCTIONS @@ -249,7 +249,7 @@ bytesToHex(unsigned8 b[16], char *s) * * Calculates the MD5 sum of the bytes in a buffer. * - * SYNOPSIS #include "md5.h" + * SYNOPSIS #include "crypt.h" * int md5_hash(const void *buff, size_t len, char *hexsum) * * INPUT buff the buffer containing the bytes that you want diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index 030921c254..86b9f2497c 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 c30ad0ce61..0000000000 --- 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 diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 73507a15b3..2973799c37 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.54 2001/08/15 18:42:15 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.55 2001/08/15 21:08:21 momjian Exp $ # #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ endif SHLIB_LINK += $(filter -L%, $(LDFLAGS)) $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl, $(LIBS)) -all: md5.c md5.h all-lib +all: md5.c all-lib # Shared library stuff include $(top_srcdir)/src/Makefile.shlib @@ -52,9 +52,6 @@ dllist.c: $(backend_src)/lib/dllist.c md5.c: $(backend_src)/libpq/md5.c rm -f $@ && $(LN_S) $< . -md5.h: $(backend_src)/../include/libpq/md5.h - rm -f $@ && $(LN_S) $< . - # this only gets done if configure finds system doesn't have inet_aton() inet_aton.c: $(backend_src)/port/inet_aton.c rm -f $@ && $(LN_S) $< . diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 6f874c485b..d4cb0ffc31 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -10,7 +10,7 @@ * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.49 2001/08/15 18:42:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.50 2001/08/15 21:08:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ #include "libpq-fe.h" #include "libpq-int.h" #include "fe-auth.h" -#include "md5.h" +#include "libpq/crypt.h" #ifdef WIN32 #include "win32.h" -- 2.11.0