diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-05 21:40:07 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-05 21:40:07 (GMT) |
| commit | 04f6a32dff60d6f22b56b887338dd6ebbdc68dfe (patch) | |
| tree | 1a8163e2cb9880e4502ac3dbbda2cdcd9e0d0e3a /Doc/library/ssl.rst | |
| parent | c50846aaef3e38d466ac9a0a87f72f09238e2061 (diff) | |
| download | cpython-04f6a32dff60d6f22b56b887338dd6ebbdc68dfe.zip cpython-04f6a32dff60d6f22b56b887338dd6ebbdc68dfe.tar.gz cpython-04f6a32dff60d6f22b56b887338dd6ebbdc68dfe.tar.bz2 | |
Merged revisions 79812 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79812 | antoine.pitrou | 2010-04-05 23:35:07 +0200 (lun., 05 avril 2010) | 5 lines
Issue #8321: Give access to OpenSSL version numbers from the `ssl` module,
using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO`
and `ssl.OPENSSL_VERSION_NUMBER`.
........
Diffstat (limited to 'Doc/library/ssl.rst')
| -rw-r--r-- | Doc/library/ssl.rst | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 905fae0..587df66 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -237,6 +237,36 @@ Functions, Constants, and Exceptions modern version, and probably the best choice for maximum protection, if both sides can speak it. +.. data:: OPENSSL_VERSION + + The version string of the OpenSSL library loaded by the interpreter:: + + >>> ssl.OPENSSL_VERSION + 'OpenSSL 0.9.8k 25 Mar 2009' + + .. versionadded:: 2.7 + +.. data:: OPENSSL_VERSION_INFO + + A tuple of five integers representing version information about the + OpenSSL library:: + + >>> ssl.OPENSSL_VERSION_INFO + (0, 9, 8, 11, 15) + + .. versionadded:: 2.7 + +.. data:: OPENSSL_VERSION_NUMBER + + The raw version number of the OpenSSL library, as a single integer:: + + >>> ssl.OPENSSL_VERSION_NUMBER + 9470143L + >>> hex(ssl.OPENSSL_VERSION_NUMBER) + '0x9080bfL' + + .. versionadded:: 2.7 + SSLSocket Objects ----------------- |