[minion-cvs] Enable (I think) SSL3_RSA_DES_192_CBC3_SHA. [Bug found ...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/src
In directory moria.mit.edu:/tmp/cvs-serv17486/src

Modified Files:
	tls.c 
Log Message:
Enable (I think) SSL3_RSA_DES_192_CBC3_SHA. [Bug found by weasel]

Index: tls.c
===================================================================
RCS file: /home/minion/cvsroot/src/minion/src/tls.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tls.c	13 Oct 2003 17:11:09 -0000	1.28
+++ tls.c	17 Oct 2003 13:24:45 -0000	1.29
@@ -122,7 +122,6 @@
         mm_RSA *rsa = NULL;
         int err = 0;
 
-        SSL_METHOD *method;
         SSL_CTX *ctx = NULL;
         DH *dh = NULL;
         BIO *bio = NULL;
@@ -138,10 +137,12 @@
                 return NULL;
 
         Py_BEGIN_ALLOW_THREADS;
-        method = TLSv1_method();
 
-        if (!(ctx = SSL_CTX_new(method)))
+        /* Allow SSL2 and SSL3 and TLS1 */
+        if (!(ctx = SSL_CTX_new(SSLv23_method())))
                 err = 1;
+        /* But not actually SSL2. */
+        SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
         if (!err && !SSL_CTX_set_cipher_list(ctx,
                                        TLS1_TXT_DHE_RSA_WITH_AES_128_SHA))
                 err = 1;