From 64eea6af56a75260a3380c58733c2f4da4155be4 Mon Sep 17 00:00:00 2001 From: Michael Hampton Date: Mon, 23 Aug 2004 21:40:04 +0000 Subject: [PATCH] * No longer accept MD5 as a hash when encrypting --- citadel/ChangeLog | 4 ++++ citadel/citadel_ipc.h | 2 +- citadel/serv_crypto.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index adcaaaa89..6295f31af 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,7 @@ $Log$ + Revision 624.5 2004/08/23 21:40:04 error + * No longer accept MD5 as a hash when encrypting + Revision 624.4 2004/08/23 21:34:28 error * serv_network.c: Suppress Invalid node name for "." and ".." @@ -5984,3 +5987,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/citadel_ipc.h b/citadel/citadel_ipc.h index dd34d3da7..2ebea61e5 100644 --- a/citadel/citadel_ipc.h +++ b/citadel/citadel_ipc.h @@ -178,7 +178,7 @@ enum MessageDirection { #define DH_P "1A74527AEE4EE2568E85D4FB2E65E18C9394B9C80C42507D7A6A0DBE9A9A54B05A9A96800C34C7AA5297095B69C88901EEFD127F969DCA26A54C0E0B5C5473EBAEB00957D2633ECAE3835775425DE66C0DE6D024DBB17445E06E6B0C78415E589B8814F08531D02FD43778451E7685541079CFFB79EF0D26EFEEBBB69D1E80383" #define DH_G "2" #define DH_L 1024 -#define CIT_CIPHERS "ALL:RC4+RSA:+SSLv2:@STRENGTH" /* see ciphers(1) */ +#define CIT_CIPHERS "ALL:RC4+RSA:+SSLv2:!MD5:@STRENGTH" /* see ciphers(1) */ int CtdlIPCNoop(CtdlIPC *ipc); int CtdlIPCEcho(CtdlIPC *ipc, const char *arg, char *cret); diff --git a/citadel/serv_crypto.h b/citadel/serv_crypto.h index d273611c1..80dcfe92b 100644 --- a/citadel/serv_crypto.h +++ b/citadel/serv_crypto.h @@ -9,7 +9,7 @@ #define DH_P "1A74527AEE4EE2568E85D4FB2E65E18C9394B9C80C42507D7A6A0DBE9A9A54B05A9A96800C34C7AA5297095B69C88901EEFD127F969DCA26A54C0E0B5C5473EBAEB00957D2633ECAE3835775425DE66C0DE6D024DBB17445E06E6B0C78415E589B8814F08531D02FD43778451E7685541079CFFB79EF0D26EFEEBBB69D1E80383" #define DH_G "2" #define DH_L 1024 -#define CIT_CIPHERS "ALL:RC4+RSA:+SSLv2:@STRENGTH" /* see ciphers(1) */ +#define CIT_CIPHERS "ALL:RC4+RSA:+SSLv2:!MD5:@STRENGTH" /* see ciphers(1) */ #ifdef HAVE_OPENSSL void init_ssl(void); -- 2.30.2