[pypy-svn] r77360 - pypy/branch/fast-forward/pypy/module/_ssl

[afa at codespeak.net]

Author: afa
Date: Sat Sep 25 00:31:55 2010
New Revision: 77360

Modified:
   pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py
Log:
Add missing constants in the _ssl module.
This should fix "import ssl"


Modified: pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py	Sat Sep 25 00:31:55 2010
@@ -51,6 +51,11 @@
 PY_SSL_ERROR_EOF = 8 # special case of SSL_ERROR_SYSCALL
 PY_SSL_ERROR_INVALID_ERROR_CODE = 9
 
+PY_SSL_CERT_NONE, PY_SSL_CERT_OPTIONAL, PY_SSL_CERT_REQUIRED = 0, 1, 2
+
+(PY_SSL_VERSION_SSL2, PY_SSL_VERSION_SSL3,
+ PY_SSL_VERSION_SSL23, PY_SSL_VERSION_TLS1) = range(4)
+
 SOCKET_IS_NONBLOCKING, SOCKET_IS_BLOCKING = 0, 1
 SOCKET_HAS_TIMED_OUT, SOCKET_HAS_BEEN_CLOSED = 2, 3
 SOCKET_TOO_LARGE_FOR_SELECT, SOCKET_OPERATION_OK = 4, 5
@@ -113,6 +118,15 @@
 constants["SSL_ERROR_EOF"] = PY_SSL_ERROR_EOF
 constants["SSL_ERROR_INVALID_ERROR_CODE"] = PY_SSL_ERROR_INVALID_ERROR_CODE
 
+constants["SSL_CERT_NONE"]     = PY_SSL_CERT_NONE
+constants["SSL_CERT_OPTIONAL"] = PY_SSL_CERT_OPTIONAL
+constants["SSL_CERT_REQUIRED"] = PY_SSL_CERT_REQUIRED
+
+constants["PROTOCOL_SSLv2"]  = PY_SSL_VERSION_SSL2
+constants["PROTOCOL_SSLv3"]  = PY_SSL_VERSION_SSL3
+constants["PROTOCOL_SSLv23"] = PY_SSL_VERSION_SSL23
+constants["PROTOCOL_TLSv1"]  = PY_SSL_VERSION_TLS1
+
 constants["OPENSSL_VERSION_NUMBER"] = OPENSSL_VERSION_NUMBER
 ver = OPENSSL_VERSION_NUMBER
 ver, status = divmod(ver, 16)