summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2016-02-13 09:10:04 +0100
committerHynek Schlawack <hs@ox.cx>2016-03-16 13:31:51 +0100
commitb1f3ca86c0bb78a524bb9c677427bb8f1dd35323 (patch)
tree3545716b851252978f01198f935df87d37686138 /doc
parentb98d56999b10296fc5ba8b783ca427450cf5e0b4 (diff)
downloadpyopenssl-git-b1f3ca86c0bb78a524bb9c677427bb8f1dd35323.tar.gz
Implement Context.set_session_id
Diffstat (limited to 'doc')
-rw-r--r--doc/api/ssl.rst18
1 files changed, 5 insertions, 13 deletions
diff --git a/doc/api/ssl.rst b/doc/api/ssl.rst
index d144cfd..0edf1ab 100644
--- a/doc/api/ssl.rst
+++ b/doc/api/ssl.rst
@@ -274,10 +274,7 @@ Context objects have the following methods:
Retrieve the Context object's verify mode, as set by :py:meth:`set_verify`.
-.. py:method:: Context.load_client_ca(pemfile)
-
- Read a file with PEM-formatted certificates that will be sent to the client
- when requesting a client certificate.
+.. automethod:: Context.load_client_ca
.. py:method:: Context.set_client_ca_list(certificate_authorities)
@@ -387,12 +384,7 @@ Context objects have the following methods:
.. versionadded:: 0.14
-.. py:method:: Context.set_session_id(name)
-
- Set the context *name* within which a session can be reused for this
- Context object. This is needed when doing session resumption, because there is
- no way for a stored session to know which Context object it is associated with.
- *name* may be any binary data.
+.. automethod:: Context.set_session_id
.. py:method:: Context.set_timeout(timeout)
@@ -684,11 +676,11 @@ Connection objects have the following methods:
bytes (for example, in response to a call to :py:meth:`recv`).
-.. py:method:: Connection.renegotiate()
+.. automethod:: Connection.renegotiate
- Renegotiate the SSL session. Call this if you wish to change cipher suites or
- anything like that.
+.. automethod:: Connection.renegotiate_pending
+.. automethod:: Connection.total_renegotiations
.. py:method:: Connection.send(string)