* No longer accept MD5 as a hash when encrypting

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index adcaaaa8962c627ffa8ca53563f679c1a414bcc4..6295f31af08a1f8ec290a0cd94b59315a5ebf1d7 100644 (file)
--- 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 <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/citadel_ipc.h b/citadel/citadel_ipc.h
index dd34d3da7312a6d4fff2e796291b439d09c8d961..2ebea61e5fee65a9eb40181aabd44744fc1f1836 100644 (file)
--- 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 d273611c19caa2695a0ba3c6d1fd0e74de3b75b3..80dcfe92b5fefff2b386273cf21d7d7bcf5a5a3f 100644 (file)
--- 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);