yassl-commit

[Todd O. <to...@us...>]

Update of /cvsroot/yassl/yassl/src
In directory vz-cvs-3.sog:/tmp/cvs-serv5315/src

Modified Files:
	yassl_int.cpp 
Log Message:
don't override user cipher list on server when key checking

Index: yassl_int.cpp
===================================================================
RCS file: /cvsroot/yassl/yassl/src/yassl_int.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** yassl_int.cpp	31 Aug 2011 23:40:45 -0000	1.35
--- yassl_int.cpp	19 Sep 2011 19:28:51 -0000	1.36
***************
*** 317,322 ****
              return;
          }
!         else if (serverSide) {
              // remove RSA or DSA suites depending on cert key type
              ProtocolVersion pv = secure_.get_connection().version_;
              
--- 317,323 ----
              return;
          }
!         else if (serverSide && ctx->GetCiphers().setSuites_ == 0) {
              // remove RSA or DSA suites depending on cert key type
+             // but don't override user sets
              ProtocolVersion pv = secure_.get_connection().version_;