diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
| commit | 159dbe295148975bdfe9a50f871254aa9adf2328 (patch) | |
| tree | 5b679b7f617c4bc09c25a4c369e77156f0ff3e2c /src/leap/bitmask/crypto/tests | |
| parent | 7858d83af4a09ab00f6ba33dd8dbcf07ade101ce (diff) | |
| parent | 312746bc9b77f0f738ccf2192d81ab94fdf9d6ba (diff) | |
Merge branch 'release-0.6.0'0.6.0
Diffstat (limited to 'src/leap/bitmask/crypto/tests')
| -rwxr-xr-x | src/leap/bitmask/crypto/tests/fake_provider.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/crypto/tests/fake_provider.py b/src/leap/bitmask/crypto/tests/fake_provider.py index b8cdbb12..60a3ef0a 100755 --- a/src/leap/bitmask/crypto/tests/fake_provider.py +++ b/src/leap/bitmask/crypto/tests/fake_provider.py @@ -156,7 +156,7 @@ def getSession(self, sessionInterface=None): put the right cookie name in place """ if not self.session: - #cookiename = b"_".join([b'TWISTED_SESSION'] + self.sitepath) + # cookiename = b"_".join([b'TWISTED_SESSION'] + self.sitepath) cookiename = b"_".join([b'_session_id'] + self.sitepath) sessionCookie = self.getCookie(cookiename) if sessionCookie: @@ -321,7 +321,7 @@ class OpenSSLServerContextFactory(object): Create an SSL context. """ ctx = SSL.Context(SSL.SSLv23_METHOD) - #ctx = SSL.Context(SSL.TLSv1_METHOD) + # ctx = SSL.Context(SSL.TLSv1_METHOD) ctx.use_certificate_file(where('leaptestscert.pem')) ctx.use_privatekey_file(where('leaptestskey.pem')) |