From: | Marko Kreen <marko(at)l-t(dot)ee> |
---|---|
To: | pgsql-patches(at)postgresql(dot)org |
Subject: | [patch 2/7] remove last pieces of system crypt() |
Date: | 2005-08-01 21:15:02 |
Message-ID: | 20050801211513.208357000@grue |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-patches |
It is already disabled in Makefile, remove code too.
Index: pgsql/contrib/pgcrypto/px-crypt.c
===================================================================
*** pgsql.orig/contrib/pgcrypto/px-crypt.c
--- pgsql/contrib/pgcrypto/px-crypt.c
***************
*** 35,42 ****
#include "px-crypt.h"
- #ifndef PX_SYSTEM_CRYPT
-
static char *
run_crypt_des(const char *psw, const char *salt,
char *buf, unsigned len)
--- 35,40 ----
*************** px_crypt(const char *psw, const char *sa
*** 107,130 ****
return c->crypt(psw, salt, buf, len);
}
- #else /* PX_SYSTEM_CRYPT */
-
- extern char *crypt(const char *psw, const char *salt);
-
- char *
- px_crypt(const char *psw, const char *salt,
- char *buf, unsigned len)
- {
- char *res;
-
- res = crypt(psw, salt);
- if (!res || strlen(res) >= len)
- return NULL;
- strcpy(buf, res);
- return buf;
- }
- #endif
-
/*
* salt generators
*/
--- 105,110 ----
Index: pgsql/contrib/pgcrypto/px-crypt.h
===================================================================
*** pgsql.orig/contrib/pgcrypto/px-crypt.h
--- pgsql/contrib/pgcrypto/px-crypt.h
*************** char *_crypt_gensalt_md5_rn(unsigned lon
*** 73,80 ****
char *_crypt_gensalt_blowfish_rn(unsigned long count,
const char *input, int size, char *output, int output_size);
- #ifndef PX_SYSTEM_CRYPT
-
/* disable 'extended DES crypt' */
/* #define DISABLE_XDES */
--- 73,78 ----
*************** char *px_crypt_des(const char *key, c
*** 88,93 ****
/* crypt-md5.c */
char *px_crypt_md5(const char *pw, const char *salt,
char *dst, unsigned dstlen);
- #endif /* !PX_SYSTEM_CRYPT */
#endif /* _PX_CRYPT_H */
--- 86,90 ----
--
From | Date | Subject | |
---|---|---|---|
Next Message | Marko Kreen | 2005-08-01 21:15:03 | [patch 3/7] Elgamal speedup |
Previous Message | Marko Kreen | 2005-08-01 21:15:01 | [patch 1/7] remove unnecessary libs |