[tor-commits] [ooni-probe/master] Fix bugs in SSL helper

[art at torproject.org]

commit 99ac1629148a5b51f67a3af654dbfe419e128eae
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Dec 7 12:06:03 2012 +0100

    Fix bugs in SSL helper
---
 oonib/oonibackend.py             |    4 ++--
 oonib/testhelpers/ssl_helpers.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py
index c78317f..868d7b7 100644
--- a/oonib/oonibackend.py
+++ b/oonib/oonibackend.py
@@ -31,8 +31,8 @@ serviceCollection = service.IServiceCollection(application)
 if config.helpers.ssl.port:
     print "Starting SSL helper on %s" % config.helpers.ssl.port
     ssl_helper = internet.SSLServer(int(config.helpers.ssl.port),
-                   http_helpers.HTTPReturnJSONHeadersHelper()),
-                   SSLContext(config))
+                   http_helpers.HTTPReturnJSONHeadersHelper(),
+                   ssl_helpers.SSLContext(config))
     ssl_helper.setServiceParent(serviceCollection)
 
 # Start the DNS Server related services
diff --git a/oonib/testhelpers/ssl_helpers.py b/oonib/testhelpers/ssl_helpers.py
index 2c07275..5c74996 100644
--- a/oonib/testhelpers/ssl_helpers.py
+++ b/oonib/testhelpers/ssl_helpers.py
@@ -5,5 +5,5 @@ class SSLContext(ssl.DefaultOpenSSLContextFactory):
     def __init__(self, *args, **kw):
         ssl.DefaultOpenSSLContextFactory.__init__(self, 
                 config.helpers.ssl.private_key,
-                config.main.ssl.certificate)
+                config.helpers.ssl.certificate)