Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3cc8661

Browse files
author
Neil Conway
committed
Remove support for libmhash/libmcrypt.
libmcrypt seems to dead, maintainer address bounces, and cast-128 fails on 2 of the 3 test vectors from RFC2144. So I see no reason to keep around stuff I don't trust anymore. Support for several crypto libraries is probably only confusing to users, although it was good for initial developing - it helped to find hidden assumptions and forced me to create regression tests for all functionality. Marko Kreen
1 parent ee4ddac commit 3cc8661

File tree

3 files changed

+2
-375
lines changed

3 files changed

+2
-375
lines changed

contrib/pgcrypto/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#
2-
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.12 2004/09/14 03:39:48 tgl Exp $
2+
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.13 2005/03/21 05:17:16 neilc Exp $
33
#
44

5-
# either 'builtin', 'mhash', 'openssl'
5+
# either 'builtin', 'openssl'
66
cryptolib = builtin
77

88
# either 'builtin', 'system'
@@ -34,12 +34,6 @@ CRYPTO_LDFLAGS = -lcrypto
3434
SRCS = openssl.c
3535
endif
3636

37-
ifeq ($(cryptolib), mhash)
38-
CRYPTO_CFLAGS = -I/usr/local/include
39-
CRYPTO_LDFLAGS = -L/usr/local/lib -lmcrypt -lmhash -lltdl
40-
SRCS = mhash.c
41-
endif
42-
4337
ifeq ($(cryptsrc), builtin)
4438
SRCS += crypt-blowfish.c crypt-des.c crypt-md5.c
4539
else

contrib/pgcrypto/README.pgcrypto

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,6 @@ OpenSSL (0.9.6):
186186
Url: http://www.openssl.org/
187187

188188

189-
mhash (0.8.9) + mcrypt (2.4.16):
190-
Hashes: MD5, SHA1, CRC32, CRC32B, GOST, TIGER, RIPEMD160,
191-
HAVAL(256,224,192,160,128)
192-
Ciphers: DES, DES3, CAST-128(CAST5), CAST-256, xTEA, 3-way,
193-
SKIPJACK, Blowfish, Twofish, LOKI97, RC2, RC4, RC6,
194-
Rijndael-128/192/256, MARS, PANAMA, WAKE, Serpent, IDEA, GOST,
195-
SAFER, SAFER+, Enigma
196-
License: LGPL
197-
Url: http://mcrypt.sourceforge.org/
198-
Url: http://mhash.sourceforge.org/
199-
200189
CREDITS
201190
=======
202191

contrib/pgcrypto/mhash.c

Lines changed: 0 additions & 356 deletions
This file was deleted.

0 commit comments

Comments
 (0)