Break SSL support out of _socket module and place it into a new

helper module _ssl.

The support for the RAND_* APIs in _ssl is now only enabled
for OpenSSL 0.9.5 and up since they were added in that
release.

Note that socketmodule.* should really be renamed to _socket.* --
unfortunately, this seems to lose the CVS history of the file.

Please review and test... I was only able to test the header file
chaos in socketmodule.c/h on Linux. The test run through fine
and compiles don't give errors or warnings.

WARNING: This patch does *not* include changes to the various
non-Unix build process files.

1 files changed, 5 insertions, 1 deletions

diff --git a/Lib/socket.py b/Lib/socket.py
index d2ac593..c460c5f 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -39,6 +39,10 @@ the setsockopt() and getsockopt() methods.
 """
 
 from _socket import *
+try:
+    from _ssl import *
+except ImportError:
+    pass
 
 import os, sys
 
@@ -56,7 +60,7 @@ if (sys.platform.lower().startswith("win")
         return _socketobject(_realsocketcall(family, type, proto))
 
     try:
-        _realsslcall = _socket.ssl
+        _realsslcall = _ssl.ssl
     except AttributeError:
         pass # No ssl
     else: