X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;ds=sidebyside;f=certmaster%2FSSLConnection.py;h=3e72d5e1d5c897e21af1b4026660520f2a363cce;hb=refs%2Fheads%2Fmaster;hp=98ed8a01843ea1125c89431299b5f26358aec395;hpb=8f2ff4d7c902d534d68ff1a16418b7be492033bf;p=certmaster.git

diff --git a/certmaster/SSLConnection.py b/certmaster/SSLConnection.py
index 98ed8a0..3e72d5e 100644
--- a/certmaster/SSLConnection.py
+++ b/certmaster/SSLConnection.py
@@ -8,7 +8,7 @@
 
 from OpenSSL import SSL
 import time, socket, select
-from func.CommonErrors import canIgnoreSSLError
+from CommonErrors import canIgnoreSSLError
 
 
 class SSLConnection:
@@ -62,7 +62,7 @@ class SSLConnection:
         c, a = self.__dict__["conn"].accept()
         return (SSLConnection(c), a)
 
-    def makefile(self, mode, bufsize):
+    def makefile(self, mode='r', bufsize=-1):
         """
         We need to use socket._fileobject Because SSL.Connection
         doesn't have a 'dup'. Not exactly sure WHY this is, but
@@ -97,6 +97,9 @@ class SSLConnection:
         if not con in write:
             raise socket.timeout((110, "Operation timed out."))
 
+        if hasattr(data, 'tobytes'):
+            data = data.tobytes()
+
         starttime = time.time()
         origlen = len(data)
         sent = -1