[or-cvs] r12652: Add DHE-RSA-AES256-SHA to the list of ciphers encountered fr (in tor/trunk: . src/common)

[nickm at seul.org]

Author: nickm
Date: 2007-12-03 12:59:32 -0500 (Mon, 03 Dec 2007)
New Revision: 12652

Modified:
   tor/trunk/
   tor/trunk/src/common/tortls.c
Log:
 r16919 at catbus:  nickm | 2007-12-03 12:59:02 -0500
 Add DHE-RSA-AES256-SHA to the list of ciphers encountered from v1 connections.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16919] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/common/tortls.c
===================================================================
--- tor/trunk/src/common/tortls.c	2007-12-03 17:38:32 UTC (rev 12651)
+++ tor/trunk/src/common/tortls.c	2007-12-03 17:59:32 UTC (rev 12652)
@@ -544,6 +544,7 @@
     SSL_CIPHER *cipher = sk_SSL_CIPHER_value(session->ciphers, i);
     const char *ciphername = SSL_CIPHER_get_name(cipher);
     if (strcmp(ciphername, TLS1_TXT_DHE_RSA_WITH_AES_128_SHA) &&
+        strcmp(ciphername, TLS1_TXT_DHE_RSA_WITH_AES_256_SHA) &&
         strcmp(ciphername, SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA) &&
         strcmp(ciphername, "(NONE)")) {
       /* XXXX should be ld_debug */