use libdes crypt() to save lots of memory, more than 100kb!

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2530 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

2 files changed, 45 insertions, 2 deletions

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index cb225405..5f99078f 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -10,7 +10,7 @@ LDFLAGS+= -L/usr/local/lib/mysql -lmysqlclient
 
 PROG=	mbbsd
 OBJS=	admin.o announce.o args.o assess.o bbs.o board.o cache.o cal.o card.o\
-	chat.o chc.o chc_tab.o chicken.o convert.o dark.o edit.o fav.o friend.o gamble.o\
+	chat.o chc.o chc_tab.o chicken.o convert.o crypt.o dark.o edit.o fav.o friend.o gamble.o\
 	gomo.o guess.o indict.o io.o kaede.o lovepaper.o mail.o mbbsd.o menu.o\
 	more.o name.o osdep.o othello.o page.o read.o record.o register.o\
 	screen.o stuff.o talk.o term.o topsong.o user.o brc.o vice.o vote.o\
diff --git a/mbbsd/crypt.c b/mbbsd/crypt.c
index d12fd2df..57d78533 100644
--- a/mbbsd/crypt.c
+++ b/mbbsd/crypt.c
@@ -1,3 +1,14 @@
+/* $Id */
+/* This file is crypt.c taken from ssh 1.2.33, only modified for compile */
+/**
+ * FreeBSD 及 Linux glibc 附的 crypt() 都會用到大 table 加速多次 crypt().
+ * 但 bbs 僅上站檢查密碼時使用一次, 不值得為此花 100kb memory.
+ * libdes 的 crypt() 僅需 4kb 的 constant lookup table.
+ *
+ * 不過要注意 libdes 4.01 的 license 跟 GPL 不合, 因此此處採用 ssh 1.2.33 裡頭
+ * 附的 crypt.c derived from libdes 3.06, 該版的 libdes 是 GPL 的.
+ */
+#define PROTO
 /* This file is fcrypt.c taken from SSLeay-0.4.3a.  This file is only compiled
    in on those systems that don't have crypt() in the system libraries. 
    //ylo */
@@ -11,6 +22,7 @@
  */
 
 #include <stdio.h>
+#define _LIBC
 
 /* Eric Young.
  * This version of crypt has been developed from my MIT compatable
@@ -55,6 +67,7 @@ typedef struct des_ks_struct
 
 static const unsigned long SPtrans[8][64]={
 /* nibble 0 */
+{
 0x00820200, 0x00020000, 0x80800000, 0x80820200,
 0x00800000, 0x80020200, 0x80020000, 0x80800000,
 0x80020200, 0x00820200, 0x00820000, 0x80000200,
@@ -71,7 +84,9 @@ static const unsigned long SPtrans[8][64]={
 0x00800000, 0x80000200, 0x80020000, 0x00000000,
 0x00020000, 0x00800000, 0x80800200, 0x00820200,
 0x80000000, 0x80820000, 0x00000200, 0x80020200,
+},
 /* nibble 1 */
+{
 0x10042004, 0x00000000, 0x00042000, 0x10040000,
 0x10000004, 0x00002004, 0x10002000, 0x00042000,
 0x00002000, 0x10040004, 0x00000004, 0x10002000,
@@ -88,7 +103,9 @@ static const unsigned long SPtrans[8][64]={
 0x00000004, 0x10042004, 0x00042000, 0x10040000,
 0x10040004, 0x00040000, 0x00002004, 0x10002000,
 0x10002004, 0x00000004, 0x10040000, 0x00042000,
+},
 /* nibble 2 */
+{
 0x41000000, 0x01010040, 0x00000040, 0x41000040,
 0x40010000, 0x01000000, 0x41000040, 0x00010040,
 0x01000040, 0x00010000, 0x01010000, 0x40000000,
@@ -105,7 +122,9 @@ static const unsigned long SPtrans[8][64]={
 0x00010000, 0x01000040, 0x41000040, 0x00010040,
 0x01000040, 0x00000000, 0x41010000, 0x40000040,
 0x41000000, 0x40010040, 0x00000040, 0x01010000,
+},
 /* nibble 3 */
+{
 0x00100402, 0x04000400, 0x00000002, 0x04100402,
 0x00000000, 0x04100000, 0x04000402, 0x00100002,
 0x04100400, 0x04000002, 0x04000000, 0x00000402,
@@ -122,7 +141,9 @@ static const unsigned long SPtrans[8][64]={
 0x04100402, 0x00000002, 0x04000400, 0x00100402,
 0x00100002, 0x00100400, 0x04100000, 0x04000402,
 0x00000402, 0x04000000, 0x04000002, 0x04100400,
+},
 /* nibble 4 */
+{
 0x02000000, 0x00004000, 0x00000100, 0x02004108,
 0x02004008, 0x02000100, 0x00004108, 0x02004000,
 0x00004000, 0x00000008, 0x02000008, 0x00004100,
@@ -139,7 +160,9 @@ static const unsigned long SPtrans[8][64]={
 0x02004008, 0x02004100, 0x00000108, 0x00004000,
 0x00004100, 0x02004008, 0x02000100, 0x00000108,
 0x00000008, 0x00004108, 0x02004000, 0x02000008,
+},
 /* nibble 5 */
+{
 0x20000010, 0x00080010, 0x00000000, 0x20080800,
 0x00080010, 0x00000800, 0x20000810, 0x00080000,
 0x00000810, 0x20080810, 0x00080800, 0x20000000,
@@ -156,7 +179,9 @@ static const unsigned long SPtrans[8][64]={
 0x20000010, 0x20080000, 0x00080810, 0x00000000,
 0x00000800, 0x20000010, 0x20000810, 0x20080800,
 0x20080000, 0x00000810, 0x00000010, 0x20080010,
+},
 /* nibble 6 */
+{
 0x00001000, 0x00000080, 0x00400080, 0x00400001,
 0x00401081, 0x00001001, 0x00001080, 0x00000000,
 0x00400000, 0x00400081, 0x00000081, 0x00401000,
@@ -173,7 +198,9 @@ static const unsigned long SPtrans[8][64]={
 0x00000081, 0x00001000, 0x00401081, 0x00400000,
 0x00401080, 0x00000001, 0x00001001, 0x00401081,
 0x00400001, 0x00401080, 0x00401000, 0x00001001,
+},
 /* nibble 7 */
+{
 0x08200020, 0x08208000, 0x00008020, 0x00000000,
 0x08008000, 0x00200020, 0x08200000, 0x08208020,
 0x00000020, 0x08000000, 0x00208000, 0x00008020,
@@ -189,9 +216,10 @@ static const unsigned long SPtrans[8][64]={
 0x08208020, 0x00200000, 0x08200000, 0x08000020,
 0x00208000, 0x00008020, 0x08008020, 0x08200000,
 0x00000020, 0x08208000, 0x00208020, 0x00000000,
-0x08000000, 0x08200020, 0x00008000, 0x00208020};
+0x08000000, 0x08200020, 0x00008000, 0x00208020}};
 static const unsigned long skb[8][64]={
 /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+{
 0x00000000,0x00000010,0x20000000,0x20000010,
 0x00010000,0x00010010,0x20010000,0x20010010,
 0x00000800,0x00000810,0x20000800,0x20000810,
@@ -208,7 +236,9 @@ static const unsigned long skb[8][64]={
 0x00090020,0x00090030,0x20090020,0x20090030,
 0x00080820,0x00080830,0x20080820,0x20080830,
 0x00090820,0x00090830,0x20090820,0x20090830,
+},
 /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
+{
 0x00000000,0x02000000,0x00002000,0x02002000,
 0x00200000,0x02200000,0x00202000,0x02202000,
 0x00000004,0x02000004,0x00002004,0x02002004,
@@ -225,7 +255,9 @@ static const unsigned long skb[8][64]={
 0x10200400,0x12200400,0x10202400,0x12202400,
 0x10000404,0x12000404,0x10002404,0x12002404,
 0x10200404,0x12200404,0x10202404,0x12202404,
+},
 /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
+{
 0x00000000,0x00000001,0x00040000,0x00040001,
 0x01000000,0x01000001,0x01040000,0x01040001,
 0x00000002,0x00000003,0x00040002,0x00040003,
@@ -242,7 +274,9 @@ static const unsigned long skb[8][64]={
 0x09000200,0x09000201,0x09040200,0x09040201,
 0x08000202,0x08000203,0x08040202,0x08040203,
 0x09000202,0x09000203,0x09040202,0x09040203,
+},
 /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
+{
 0x00000000,0x00100000,0x00000100,0x00100100,
 0x00000008,0x00100008,0x00000108,0x00100108,
 0x00001000,0x00101000,0x00001100,0x00101100,
@@ -259,7 +293,9 @@ static const unsigned long skb[8][64]={
 0x04020008,0x04120008,0x04020108,0x04120108,
 0x04021000,0x04121000,0x04021100,0x04121100,
 0x04021008,0x04121008,0x04021108,0x04121108,
+},
 /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+{
 0x00000000,0x10000000,0x00010000,0x10010000,
 0x00000004,0x10000004,0x00010004,0x10010004,
 0x20000000,0x30000000,0x20010000,0x30010000,
@@ -276,7 +312,9 @@ static const unsigned long skb[8][64]={
 0x00101004,0x10101004,0x00111004,0x10111004,
 0x20101000,0x30101000,0x20111000,0x30111000,
 0x20101004,0x30101004,0x20111004,0x30111004,
+},
 /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
+{
 0x00000000,0x08000000,0x00000008,0x08000008,
 0x00000400,0x08000400,0x00000408,0x08000408,
 0x00020000,0x08020000,0x00020008,0x08020008,
@@ -293,7 +331,9 @@ static const unsigned long skb[8][64]={
 0x02000401,0x0A000401,0x02000409,0x0A000409,
 0x02020001,0x0A020001,0x02020009,0x0A020009,
 0x02020401,0x0A020401,0x02020409,0x0A020409,
+},
 /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
+{
 0x00000000,0x00000100,0x00080000,0x00080100,
 0x01000000,0x01000100,0x01080000,0x01080100,
 0x00000010,0x00000110,0x00080010,0x00080110,
@@ -310,7 +350,9 @@ static const unsigned long skb[8][64]={
 0x01200200,0x01200300,0x01280200,0x01280300,
 0x00200210,0x00200310,0x00280210,0x00280310,
 0x01200210,0x01200310,0x01280210,0x01280310,
+},
 /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
+{
 0x00000000,0x04000000,0x00040000,0x04040000,
 0x00000002,0x04000002,0x00040002,0x04040002,
 0x00002000,0x04002000,0x00042000,0x04042000,
@@ -327,6 +369,7 @@ static const unsigned long skb[8][64]={
 0x00000822,0x04000822,0x00040822,0x04040822,
 0x00002820,0x04002820,0x00042820,0x04042820,
 0x00002822,0x04002822,0x00042822,0x04042822,
+}
 };
 
 /* See ecb_encrypt.c for a pseudo description of these macros. */