From cb76fce2395473454f24af26489a58a51a028010 Mon Sep 17 00:00:00 2001 From: Michael Hampton Date: Tue, 25 Jan 2005 15:02:13 +0000 Subject: [PATCH] * Updated SSL/TLS code to actually use the TLS cipher suites --- citadel/ChangeLog | 4 +++- citadel/citadel_ipc.h | 2 +- citadel/serv_crypto.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 07f8658ff..73b71399f 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,7 @@ $Log$ + Revision 630.3 2005/01/25 15:02:12 error + * Updated SSL/TLS code to actually use the TLS cipher suites + Revision 630.2 2005/01/22 04:15:32 ajc * Increased per-thread stack size again, this time to 1MB @@ -6305,4 +6308,3 @@ 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 10c5d589f..93d1e6c6d 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:!MD5:@STRENGTH" /* see ciphers(1) */ +#define CIT_CIPHERS "ALL:RC4+RSA:+SSLv2:+TLSv1:!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 80dcfe92b..e8e13c2dd 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:!MD5:@STRENGTH" /* see ciphers(1) */ +#define CIT_CIPHERS "ALL:RC4+RSA:+SSLv2:+TLSv1:!MD5:@STRENGTH" /* see ciphers(1) */ #ifdef HAVE_OPENSSL void init_ssl(void); -- 2.39.2