incref the X509Req when returning an X509Name from get_subject which refers to it; this prevents a segfault if the X509Name outlives the X509Req; update docs to reflect this and to reflect previous similar changes which were apparently made to X509.get_subject and X509.get_issuer
diff --git a/doc/html/about.html b/doc/html/about.html
index 50a55ce..19f4c4d 100644
--- a/doc/html/about.html
+++ b/doc/html/about.html
@@ -42,7 +42,8 @@
<H1><A NAME="SECTION000600000000000000000">
About this document ...</A>
-</H1><strong>Python OpenSSL Manual</strong>
+</H1>
+ <strong>Python OpenSSL Manual</strong>
<p> This document was generated using the <a
href="http://saftsack.fs.uni-bayreuth.de/~latex2ht/">
<strong>LaTeX</strong>2<tt>HTML</tt></a> translator.
diff --git a/doc/html/callbacks.html b/doc/html/callbacks.html
index b3f2787..16911b5 100644
--- a/doc/html/callbacks.html
+++ b/doc/html/callbacks.html
@@ -47,18 +47,19 @@
<BR>
4.2 Callbacks
</H2>
+
<P>
-<EM><EM><EM>There are a number of problems with callbacks. First of all, OpenSSL is written
+There are a number of problems with callbacks. First of all, OpenSSL is written
as a C library, it's not meant to have Python callbacks, so a way around that
is needed. Another problem is thread support. A lot of the OpenSSL I/O
functions can block if the socket is in blocking mode, and then you want other
Python threads to be able to do other things. The real trouble is if you've
released the thread lock to do a potentially blocking operation, and the
operation calls a callback. Then we must take the thread lock back<A NAME="tex2html6"
- HREF="#foot935"><SUP>5</SUP></A>.
-</EM></EM></EM>
+ HREF="#foot932"><SUP>5</SUP></A>.
+
<P>
-<EM><EM><EM>There are two solutions to the first problem, both of which are necessary. The
+There are two solutions to the first problem, both of which are necessary. The
first solution to use is if the C callback allows ''userdata'' to be passed to
it (an arbitrary pointer normally). This is great! We can set our Python
function object as the real userdata and emulate userdata for the Python
@@ -68,9 +69,9 @@
callbacks, you can retrieve the related SSL object. What we do is to set our
wrapper <tt class="class">Connection</tt> object as app_data for the SSL object, and we can
easily find the Python callback.
-</EM></EM></EM>
+
<P>
-<EM><EM><EM>The other problem is also partially solved by app_data. Since we're associating
+The other problem is also partially solved by app_data. Since we're associating
our wrapper objects with the ''real'' objects, we can easily access data from
the <tt class="class">Connection</tt> object. The solution then is to simply include a
<tt class="ctype">PyThreadState</tt> variable in the <tt class="class">Connection</tt> declaration, and write
@@ -79,11 +80,11 @@
<tt class="ctype">PyThreadState</tt> variable to use. Now we can simply ''begin allow
threads'' before a potentially blocking operation, and ''end allow threads''
before calling a callback.
-</EM></EM></EM>
+
<P>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot935">... back</A><A
+<DT><A NAME="foot932">... back</A><A
href="callbacks.html#tex2html6"><SUP>5</SUP></A></DT>
<DD>I'm
not sure why this is necessary, but otherwise I get a segmentation violation on
diff --git a/doc/html/exceptions.html b/doc/html/exceptions.html
index 9c8345e..bb49d19 100644
--- a/doc/html/exceptions.html
+++ b/doc/html/exceptions.html
@@ -47,17 +47,18 @@
<BR>
4.1 Exceptions
</H2>
+
<P>
-<EM><EM><EM>We realized early that most of the exceptions would be raised by the I/O
+We realized early that most of the exceptions would be raised by the I/O
functions of OpenSSL, so it felt natural to mimic OpenSSL's error code system,
translating them into Python exceptions. This naturally gives us the exceptions
<tt class="exception">SSL.ZeroReturnError</tt>, <tt class="exception">SSL.WantReadError</tt>,
<tt class="exception">SSL.WantWriteError</tt>, <tt class="exception">SSL.WantX509LookupError</tt> and
<tt class="exception">SSL.SysCallError</tt>.
-</EM></EM></EM>
+
<P>
-<EM><EM><EM>For more information about this, see section <A href="openssl-ssl.html#openssl-ssl">3.3</A>.
-</EM></EM></EM>
+For more information about this, see section <A href="openssl-ssl.html#openssl-ssl">3.3</A>.
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/internals.html b/doc/html/internals.html
index 1ecfb5d..c3128d2 100644
--- a/doc/html/internals.html
+++ b/doc/html/internals.html
@@ -46,10 +46,11 @@
<BR>
4 Internals
</H1>
+
<P>
-<EM><EM><EM>We ran into three main problems developing this: Exceptions, callbacks and
+We ran into three main problems developing this: Exceptions, callbacks and
accessing socket methods. This is what this chapter is about.
-</EM></EM></EM>
+
<P>
<p><hr>
diff --git a/doc/html/intro.html b/doc/html/intro.html
index 2e06763..8ad4884 100644
--- a/doc/html/intro.html
+++ b/doc/html/intro.html
@@ -60,9 +60,9 @@
unfortunately its error handling system does not seem to be finished,
especially for non-blocking I/O. I think that much of the reason for this
is that M2Crypto<A NAME="tex2html1"
- HREF="#foot895"><SUP>1</SUP></A> is
+ HREF="#foot892"><SUP>1</SUP></A> is
developed using SWIG<A NAME="tex2html2"
- HREF="#foot896"><SUP>2</SUP></A>. This
+ HREF="#foot893"><SUP>2</SUP></A>. This
makes it awkward to create functions that e.g. can return both an integer and
NULL since (as far as I know) you basically write C functions and SWIG makes
wrapper functions that parses the Python argument list and calls your C
@@ -71,12 +71,12 @@
<P>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot895">... M2Crypto</A><A
+<DT><A NAME="foot892">... M2Crypto</A><A
href="intro.html#tex2html1"><SUP>1</SUP></A></DT>
<DD>See <a class="url" href="http://www.post1.com/home/ngps/m2/">http://www.post1.com/home/ngps/m2/</a>
</DD>
-<DT><A NAME="foot896">... SWIG</A><A
+<DT><A NAME="foot893">... SWIG</A><A
href="intro.html#tex2html2"><SUP>2</SUP></A></DT>
<DD>See <a class="url" href="http://swig.sourceforge.net/">http://swig.sourceforge.net/</a>
diff --git a/doc/html/openssl-509ext.html b/doc/html/openssl-509ext.html
index c5a8a3b..cf800bd 100644
--- a/doc/html/openssl-509ext.html
+++ b/doc/html/openssl-509ext.html
@@ -47,14 +47,16 @@
<BR>
3.1.8 X509Extension objects
</H3>
+
<P>
-<EM><EM><EM>X509Extension objects currently only have one method:
-</EM></EM></EM>
+X509Extension objects currently only have one method:
+
<P>
<dl><dt><b><a name='l2h-75'><tt class='method'>get_critical</tt></a></b>()
<dd>
Return the critical field of the extension object.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-connection.html b/doc/html/openssl-connection.html
index e8592b8..c0ff1cf 100644
--- a/doc/html/openssl-connection.html
+++ b/doc/html/openssl-connection.html
@@ -46,9 +46,10 @@
<BR>
3.3.2 Connection objects
</H3>
+
<P>
-<EM><EM><EM>Connection objects have the following methods:
-</EM></EM></EM>
+Connection objects have the following methods:
+
<P>
<dl><dt><b><a name='l2h-138'><tt class='method'>accept</tt></a></b>()
<dd>
@@ -58,17 +59,20 @@
is the new Connection object created, and <var>address</var> is as returned by the
socket's <tt class="method">accept</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-139'><tt class='method'>bind</tt></a></b>(<var>address</var>)
<dd>
Call the <tt class="method">bind</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-140'><tt class='method'>close</tt></a></b>()
<dd>
Call the <tt class="method">close</tt> method of the underlying socket. Note: If you want
correct SSL closure, you need to call the <tt class="method">shutdown</tt> method first.
</dl>
+
<P>
<dl><dt><b><a name='l2h-141'><tt class='method'>connect</tt></a></b>(<var>address</var>)
<dd>
@@ -76,6 +80,7 @@
socket, using the Context object supplied to this Connection object at
creation.
</dl>
+
<P>
<dl><dt><b><a name='l2h-142'><tt class='method'>connect_ex</tt></a></b>(<var>address</var>)
<dd>
@@ -84,6 +89,7 @@
creation. Note that if the <tt class="method">connect_ex</tt> method of the socket doesn't
return 0, SSL won't be initialized.
</dl>
+
<P>
<dl><dt><b><a name='l2h-143'><tt class='method'>do_handshake</tt></a></b>()
<dd>
@@ -91,21 +97,25 @@
<tt class="method">set_accept_state</tt> or <tt class="method">set_accept_state</tt>). This can raise the
same exceptions as <tt class="method">send</tt> and <tt class="method">recv</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-144'><tt class='method'>fileno</tt></a></b>()
<dd>
Retrieve the file descriptor number for the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-145'><tt class='method'>listen</tt></a></b>(<var>backlog</var>)
<dd>
Call the <tt class="method">listen</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-146'><tt class='method'>get_app_data</tt></a></b>()
<dd>
Retrieve application data as set by <tt class="method">set_app_data</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-147'><tt class='method'>get_cipher_list</tt></a></b>()
<dd>
@@ -113,37 +123,44 @@
has changed. It used to take an optional parameter and just return a string,
but not it returns the entire list in one go.
</dl>
+
<P>
<dl><dt><b><a name='l2h-148'><tt class='method'>get_context</tt></a></b>()
<dd>
Retrieve the Context object associated with this Connection.
</dl>
+
<P>
<dl><dt><b><a name='l2h-149'><tt class='method'>get_peer_certificate</tt></a></b>()
<dd>
Retrieve the other side's certificate (if any)
</dl>
+
<P>
<dl><dt><b><a name='l2h-150'><tt class='method'>getpeername</tt></a></b>()
<dd>
Call the <tt class="method">getpeername</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-151'><tt class='method'>getsockname</tt></a></b>()
<dd>
Call the <tt class="method">getsockname</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-152'><tt class='method'>getsockopt</tt></a></b>(<var>level, optname</var><big>[</big><var>, buflen</var><big>]</big>)
<dd>
Call the <tt class="method">getsockopt</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-153'><tt class='method'>pending</tt></a></b>()
<dd>
Retrieve the number of bytes that can be safely read from the SSL buffer
(<i>not</i> the underlying transport buffer).
</dl>
+
<P>
<dl><dt><b><a name='l2h-154'><tt class='method'>recv</tt></a></b>(<var>bufsize</var>)
<dd>
@@ -151,17 +168,20 @@
data received. The maximum amount of data to be received at once, is specified
by <var>bufsize</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-155'><tt class='method'>renegotiate</tt></a></b>()
<dd>
Renegotiate the SSL session. Call this if you wish to change cipher suites or
anything like that.
</dl>
+
<P>
<dl><dt><b><a name='l2h-156'><tt class='method'>send</tt></a></b>(<var>string</var>)
<dd>
Send the <var>string</var> data to the Connection.
</dl>
+
<P>
<dl><dt><b><a name='l2h-157'><tt class='method'>sendall</tt></a></b>(<var>string</var>)
<dd>
@@ -169,34 +189,40 @@
repeatedly until all data is sent. If an error occurs, it's impossible to tell
how much data has been sent.
</dl>
+
<P>
<dl><dt><b><a name='l2h-158'><tt class='method'>set_accept_state</tt></a></b>()
<dd>
Set the connection to work in server mode. The handshake will be handled
automatically by read/write.
</dl>
+
<P>
<dl><dt><b><a name='l2h-159'><tt class='method'>set_app_data</tt></a></b>(<var>data</var>)
<dd>
Associate <var>data</var> with this Connection object. <var>data</var> can be retrieved
later using the <tt class="method">get_app_data</tt> method.
</dl>
+
<P>
<dl><dt><b><a name='l2h-160'><tt class='method'>set_connect_state</tt></a></b>()
<dd>
Set the connection to work in client mode. The handshake will be handled
automatically by read/write.
</dl>
+
<P>
<dl><dt><b><a name='l2h-161'><tt class='method'>setblocking</tt></a></b>(<var>flag</var>)
<dd>
Call the <tt class="method">setblocking</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-162'><tt class='method'>setsockopt</tt></a></b>(<var>level, optname, value</var>)
<dd>
Call the <tt class="method">setsockopt</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-163'><tt class='method'>shutdown</tt></a></b>()
<dd>
@@ -205,40 +231,47 @@
<tt class="method">recv()</tt> or <tt class="method">send()</tt> when the connection becomes
readable/writeable.
</dl>
+
<P>
<dl><dt><b><a name='l2h-164'><tt class='method'>get_shutdown</tt></a></b>()
<dd>
Get the shutdown state of the Connection. Returns a bitvector of either or
both of <var>SENT_SHUTDOWN</var> and <var>RECEIVED_SHUTDOWN</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-165'><tt class='method'>set_shutdown</tt></a></b>(<var>state</var>)
<dd>
Set the shutdown state of the Connection. <var>state</var> is a bitvector of
either or both of <var>SENT_SHUTDOWN</var> and <var>RECEIVED_SHUTDOWN</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-166'><tt class='method'>sock_shutdown</tt></a></b>(<var>how</var>)
<dd>
Call the <tt class="method">shutdown</tt> method of the underlying socket.
</dl>
+
<P>
<dl><dt><b><a name='l2h-167'><tt class='method'>state_string</tt></a></b>()
<dd>
Retrieve a verbose string detailing the state of the Connection.
</dl>
+
<P>
<dl><dt><b><a name='l2h-168'><tt class='method'>want_read</tt></a></b>()
<dd>
Checks if more data has to be read from the transport layer to complete an
operation.
</dl>
+
<P>
<dl><dt><b><a name='l2h-169'><tt class='method'>want_write</tt></a></b>()
<dd>
Checks if there is data to write to the transport layer to complete an
operation.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-context.html b/doc/html/openssl-context.html
index d5a2ab0..4af8a66 100644
--- a/doc/html/openssl-context.html
+++ b/doc/html/openssl-context.html
@@ -47,9 +47,10 @@
<BR>
3.3.1 Context objects
</H3>
+
<P>
-<EM><EM><EM>Context objects have the following methods:
-</EM></EM></EM>
+Context objects have the following methods:
+
<P>
<dl><dt><b><a name='l2h-114'><tt class='method'>check_privatekey</tt></a></b>()
<dd>
@@ -57,11 +58,13 @@
matches the certificate (loaded with <tt class="method">use_certificate<big>[</big>_file<big>]</big></tt>).
Returns true if they match, false otherwise.
</dl>
+
<P>
<dl><dt><b><a name='l2h-115'><tt class='method'>get_app_data</tt></a></b>()
<dd>
Retrieve application data as set by <tt class="method">set_app_data</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-116'><tt class='method'>get_cert_store</tt></a></b>()
<dd>
@@ -69,52 +72,61 @@
This can be used to add "trusted" certificates without using the.
<tt class="method">load_verify_locations()</tt> method.
</dl>
+
<P>
<dl><dt><b><a name='l2h-117'><tt class='method'>get_timeout</tt></a></b>()
<dd>
Retrieve session timeout, as set by <tt class="method">set_timeout</tt>. The default is 300
seconds.
</dl>
+
<P>
<dl><dt><b><a name='l2h-118'><tt class='method'>get_verify_depth</tt></a></b>()
<dd>
Retrieve the Context object's verify depth, as set by
<tt class="method">set_verify_depth</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-119'><tt class='method'>get_verify_mode</tt></a></b>()
<dd>
Retrieve the Context object's verify mode, as set by <tt class="method">set_verify_mode</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-120'><tt class='method'>load_client_ca</tt></a></b>(<var>pemfile</var>)
<dd>
Read a file with PEM-formatted certificates that will be sent to the client
when requesting a client certificate.
</dl>
+
<P>
<dl><dt><b><a name='l2h-121'><tt class='method'>load_verify_locations</tt></a></b>(<var>pemfile</var>)
<dd>
Specify where CA certificates for verification purposes are located. These are
trusted certificates. Note that the certificates have to be in PEM format.
</dl>
+
<P>
<dl><dt><b><a name='l2h-122'><tt class='method'>load_tmp_dh</tt></a></b>(<var>dhfile</var>)
<dd>
Load parameters for Ephemeral Diffie-Hellman from <var>dhfile</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-123'><tt class='method'>set_app_data</tt></a></b>(<var>data</var>)
<dd>
Associate <var>data</var> with this Context object. <var>data</var> can be retrieved
later using the <tt class="method">get_app_data</tt> method.
</dl>
+
<P>
<dl><dt><b><a name='l2h-124'><tt class='method'>set_cipher_list</tt></a></b>(<var>ciphers</var>)
<dd>
Set the list of ciphers to be used in this context. See the OpenSSL manual for
more information (e.g. ciphers(1))
</dl>
+
<P>
<dl><dt><b><a name='l2h-125'><tt class='method'>set_info_callback</tt></a></b>(<var>callback</var>)
<dd>
@@ -125,12 +137,14 @@
was called, and the other the return code from a (possibly failed) internal
function call.
</dl>
+
<P>
<dl><dt><b><a name='l2h-126'><tt class='method'>set_options</tt></a></b>(<var>options</var>)
<dd>
Add SSL options. Options you have set before are not cleared!
This method should be used with the <tt class="constant">OP_*</tt> constants.
</dl>
+
<P>
<dl><dt><b><a name='l2h-127'><tt class='method'>set_passwd_cb</tt></a></b>(<var>callback</var><big>[</big><var>, userdata</var><big>]</big>)
<dd>
@@ -144,6 +158,7 @@
error occurs, <var>callback</var> should return a false value (e.g. an empty
string).
</dl>
+
<P>
<dl><dt><b><a name='l2h-128'><tt class='method'>set_session_id</tt></a></b>(<var>name</var>)
<dd>
@@ -152,6 +167,7 @@
no way for a stored session to know which Context object it is associated with.
<var>name</var> may be any binary data.
</dl>
+
<P>
<dl><dt><b><a name='l2h-129'><tt class='method'>set_timeout</tt></a></b>(<var>timeout</var>)
<dd>
@@ -160,6 +176,7 @@
value is 300 seconds. See the OpenSSL manual for more information (e.g.
SSL_CTX_set_timeout(3)).
</dl>
+
<P>
<dl><dt><b><a name='l2h-130'><tt class='method'>set_verify</tt></a></b>(<var>mode, callback</var>)
<dd>
@@ -174,33 +191,39 @@
depth and return code. <var>callback</var> should return true if verification passes
and false otherwise.
</dl>
+
<P>
<dl><dt><b><a name='l2h-131'><tt class='method'>set_verify_depth</tt></a></b>(<var>depth</var>)
<dd>
Set the maximum depth for the certificate chain verification that shall be
allowed for this Context object.
</dl>
+
<P>
<dl><dt><b><a name='l2h-132'><tt class='method'>use_certificate</tt></a></b>(<var>cert</var>)
<dd>
Use the certificate <var>cert</var> which has to be a X509 object.
</dl>
+
<P>
<dl><dt><b><a name='l2h-133'><tt class='method'>add_extra_chain_cert</tt></a></b>(<var>cert</var>)
<dd>
Adds the certificate <var>cert</var>, which has to be a X509 object, to the
certificate chain presented together with the certificate.
</dl>
+
<P>
<dl><dt><b><a name='l2h-134'><tt class='method'>use_certificate_chain_file</tt></a></b>(<var>file</var>)
<dd>
Load a certificate chain from <var>file</var> which must be PEM encoded.
</dl>
+
<P>
<dl><dt><b><a name='l2h-135'><tt class='method'>use_privatekey</tt></a></b>(<var>pkey</var>)
<dd>
Use the private key <var>pkey</var> which has to be a PKey object.
</dl>
+
<P>
<dl><dt><b><a name='l2h-136'><tt class='method'>use_certificate_file</tt></a></b>(<var>file</var><big>[</big><var>, format</var><big>]</big>)
<dd>
@@ -208,6 +231,7 @@
format specified by <var>format</var>, which is either <tt class="constant">FILETYPE_PEM</tt> or
<tt class="constant">FILETYPE_ASN1</tt>. The default is <tt class="constant">FILETYPE_PEM</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-137'><tt class='method'>use_privatekey_file</tt></a></b>(<var>file</var><big>[</big><var>, format</var><big>]</big>)
<dd>
@@ -215,6 +239,7 @@
format specified by <var>format</var>, which is either <tt class="constant">FILETYPE_PEM</tt> or
<tt class="constant">FILETYPE_ASN1</tt>. The default is <tt class="constant">FILETYPE_PEM</tt>.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-netscape-spki.html b/doc/html/openssl-netscape-spki.html
index db08e2f..b83c869 100644
--- a/doc/html/openssl-netscape-spki.html
+++ b/doc/html/openssl-netscape-spki.html
@@ -46,34 +46,40 @@
<BR>
3.1.9 NetscapeSPKI objects
</H3>
+
<P>
-<EM><EM><EM>NetscapeSPKI objects have the following methods:
-</EM></EM></EM>
+NetscapeSPKI objects have the following methods:
+
<P>
<dl><dt><b><a name='l2h-76'><tt class='method'>b64_encode</tt></a></b>()
<dd>
Return a base64-encoded string representation of the object.
</dl>
+
<P>
<dl><dt><b><a name='l2h-77'><tt class='method'>get_pubkey</tt></a></b>()
<dd>
Return the public key of object.
</dl>
+
<P>
<dl><dt><b><a name='l2h-78'><tt class='method'>set_pubkey</tt></a></b>(<var>key</var>)
<dd>
Set the public key of the object to <var>key</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-79'><tt class='method'>sign</tt></a></b>(<var>key, digest_name</var>)
<dd>
Sign the NetscapeSPKI object using the given <var>key</var> and <var>digest_name</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-80'><tt class='method'>verify</tt></a></b>(<var>key</var>)
<dd>
Verify the NetscapeSPKI object using the given <var>key</var>.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-pkcs12.html b/doc/html/openssl-pkcs12.html
index d881659..402fbd9 100644
--- a/doc/html/openssl-pkcs12.html
+++ b/doc/html/openssl-pkcs12.html
@@ -47,25 +47,29 @@
<BR>
3.1.7 PKCS12 objects
</H3>
+
<P>
-<EM><EM><EM>PKCS12 objects have the following methods:
-</EM></EM></EM>
+PKCS12 objects have the following methods:
+
<P>
<dl><dt><b><a name='l2h-72'><tt class='method'>get_certificate</tt></a></b>()
<dd>
Return certificate portion of the PKCS12 structure.
</dl>
+
<P>
<dl><dt><b><a name='l2h-73'><tt class='method'>get_privatekey</tt></a></b>()
<dd>
Return private key portion of the PKCS12 structure
</dl>
+
<P>
<dl><dt><b><a name='l2h-74'><tt class='method'>get_ca_certificates</tt></a></b>()
<dd>
Return CA certificates within the PKCS12 object as a tuple. Returns
None if no CA certificates are present.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-pkcs7.html b/doc/html/openssl-pkcs7.html
index de5bf8e..fc673b0 100644
--- a/doc/html/openssl-pkcs7.html
+++ b/doc/html/openssl-pkcs7.html
@@ -47,34 +47,40 @@
<BR>
3.1.6 PKCS7 objects
</H3>
+
<P>
-<EM><EM><EM>PKCS7 objects have the following methods:
-</EM></EM></EM>
+PKCS7 objects have the following methods:
+
<P>
<dl><dt><b><a name='l2h-67'><tt class='method'>type_is_signed</tt></a></b>()
<dd>
FIXME
</dl>
+
<P>
<dl><dt><b><a name='l2h-68'><tt class='method'>type_is_enveloped</tt></a></b>()
<dd>
FIXME
</dl>
+
<P>
<dl><dt><b><a name='l2h-69'><tt class='method'>type_is_signedAndEnveloped</tt></a></b>()
<dd>
FIXME
</dl>
+
<P>
<dl><dt><b><a name='l2h-70'><tt class='method'>type_is_data</tt></a></b>()
<dd>
FIXME
</dl>
+
<P>
<dl><dt><b><a name='l2h-71'><tt class='method'>get_type_name</tt></a></b>()
<dd>
Get the type name of the PKCS7.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-pkey.html b/doc/html/openssl-pkey.html
index 5fca9e2..b6cd3c2 100644
--- a/doc/html/openssl-pkey.html
+++ b/doc/html/openssl-pkey.html
@@ -47,25 +47,29 @@
<BR>
3.1.5 PKey objects
</H3>
+
<P>
-<EM><EM><EM>The PKey object has the following methods:
-</EM></EM></EM>
+The PKey object has the following methods:
+
<P>
<dl><dt><b><a name='l2h-64'><tt class='method'>bits</tt></a></b>()
<dd>
Return the number of bits of the key.
</dl>
+
<P>
<dl><dt><b><a name='l2h-65'><tt class='method'>generate_key</tt></a></b>(<var>type, bits</var>)
<dd>
Generate a public/private key pair of the type <var>type</var> (one of
<tt class="constant">TYPE_RSA</tt> and <tt class="constant">TYPE_DSA</tt>) with the size <var>bits</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-66'><tt class='method'>type</tt></a></b>()
<dd>
Return the type of the key.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-rand.html b/doc/html/openssl-rand.html
index a12fcff..19cb25e 100644
--- a/doc/html/openssl-rand.html
+++ b/doc/html/openssl-rand.html
@@ -47,62 +47,70 @@
<BR>
3.2 <tt class="module">rand</tt> -- An interface to the OpenSSL pseudo random number generator
</H2>
+
<P>
-<EM><EM><EM>
-</EM></EM></EM>
+
+
<P>
-<EM><EM><EM>This module handles the OpenSSL pseudo random number generator (PRNG) and
+This module handles the OpenSSL pseudo random number generator (PRNG) and
declares the following:
-</EM></EM></EM>
+
<P>
<dl><dt><b><a name='l2h-82'><tt class='function'>add</tt></a></b>(<var>string, entropy</var>)
<dd>
Mix bytes from <var>string</var> into the PRNG state. The <var>entropy</var> argument is
(the lower bound of) an estimate of how much randomness is contained in
-<var>string</var>, measured in bytes. For more information, see e.g. <a class="rfc" name="rfcref-1802"
+<var>string</var>, measured in bytes. For more information, see e.g. <a class="rfc" name="rfcref-1793"
href="http://www.ietf.org/rfc/rfc1750.txt">RFC 1750</a>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-83'><tt class='function'>egd</tt></a></b>(<var>path</var><big>[</big><var>, bytes</var><big>]</big>)
<dd>
Query the Entropy Gathering Daemon<A NAME="tex2html3"
- HREF="#foot917"><SUP>3</SUP></A> on socket <var>path</var> for <var>bytes</var>
+ HREF="#foot914"><SUP>3</SUP></A> on socket <var>path</var> for <var>bytes</var>
bytes of random data and and uses <tt class="function">add</tt> to seed the PRNG. The default
value of <var>bytes</var> is 255.
</dl>
+
<P>
<dl><dt><b><a name='l2h-84'><tt class='function'>load_file</tt></a></b>(<var>path</var><big>[</big><var>, bytes</var><big>]</big>)
<dd>
Read <var>bytes</var> bytes (or all of it, if <var>bytes</var> is negative) of data from
the file <var>path</var> to seed the PRNG. The default value of <var>bytes</var> is -1.
</dl>
+
<P>
<dl><dt><b><a name='l2h-85'><tt class='function'>screen</tt></a></b>()
<dd>
Add the current contents of the screen to the PRNG state.
Availability: Windows.
</dl>
+
<P>
<dl><dt><b><a name='l2h-86'><tt class='function'>seed</tt></a></b>(<var>string</var>)
<dd>
This is equivalent to calling <tt class="function">add</tt> with <var>entropy</var> as the length
of the string.
</dl>
+
<P>
<dl><dt><b><a name='l2h-87'><tt class='function'>status</tt></a></b>()
<dd>
Returns true if the PRNG has been seeded with enough data, and false otherwise.
</dl>
+
<P>
<dl><dt><b><a name='l2h-88'><tt class='function'>write_file</tt></a></b>(<var>path</var>)
<dd>
Write a number of random bytes (currently 1024) to the file <var>path</var>. This
file can then be used with <tt class="function">load_file</tt> to seed the PRNG again.
</dl>
+
<P>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot917">... Daemon</A><A
+<DT><A NAME="foot914">... Daemon</A><A
href="openssl-rand.html#tex2html3"><SUP>3</SUP></A></DT>
<DD>See
<a class="url" href="http://www.lothar.com/tech/crypto/">http://www.lothar.com/tech/crypto/</a>
diff --git a/doc/html/openssl-ssl.html b/doc/html/openssl-ssl.html
index 4d1abcc..0feb9e4 100644
--- a/doc/html/openssl-ssl.html
+++ b/doc/html/openssl-ssl.html
@@ -45,13 +45,14 @@
<BR>
3.3 <tt class="module">SSL</tt> -- An interface to the SSL-specific parts of OpenSSL
</H2>
+
<P>
-<EM><EM><EM>
-</EM></EM></EM>
+
+
<P>
-<EM><EM><EM>This module handles things specific to SSL. There are two objects defined:
+This module handles things specific to SSL. There are two objects defined:
Context, Connection.
-</EM></EM></EM>
+
<P>
<dl><dt><b><a name='l2h-90'><tt>SSLv2_METHOD</tt></a></b>
<dd>
@@ -61,6 +62,7 @@
These constants represent the different SSL methods to use when creating a
context object.
</dl>
+
<P>
<dl><dt><b><a name='l2h-91'><tt>VERIFY_NONE</tt></a></b>
<dd>
@@ -69,6 +71,7 @@
These constants represent the verification mode used by the Context
object's <tt class="method">set_verify</tt> method.
</dl>
+
<P>
<dl><dt><b><a name='l2h-92'><tt>FILETYPE_PEM</tt></a></b>
<dd>
@@ -76,6 +79,7 @@
File type constants used with the <tt class="method">use_certificate_file</tt> and
<tt class="method">use_privatekey_file</tt> methods of Context objects.
</dl>
+
<P>
<dl><dt><b><a name='l2h-93'><tt>OP_SINGLE_DH_USE</tt></a></b>
<dd>
@@ -91,11 +95,13 @@
interesting if you're using e.g. <tt class="constant">SSLv23_METHOD</tt> to get an SSLv2-compatible
handshake, but don't want to use SSLv2.
</dl>
+
<P>
<dl><dt><b><a name='l2h-94'><tt>ContextType</tt></a></b>
<dd>
A Python type object representing the Context object type.
</dl>
+
<P>
<dl><dt><b><a name='l2h-95'><tt class='function'>Context</tt></a></b>(<var>method</var>)
<dd>
@@ -103,31 +109,35 @@
method should be <tt class="constant">SSLv2_METHOD</tt>, <tt class="constant">SSLv3_METHOD</tt>,
<tt class="constant">SSLv23_METHOD</tt> or <tt class="constant">TLSv1_METHOD</tt>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-96'><tt>ConnectionType</tt></a></b>
<dd>
A Python type object representing the Connection object type.
</dl>
+
<P>
<dl><dt><b><a name='l2h-97'><tt class='function'>Connection</tt></a></b>(<var>context, socket</var>)
<dd>
Factory fucnction that creates a new Connection object given an SSL context and
a socket <A NAME="tex2html5"
- HREF="#foot920"><SUP>4</SUP></A> object.
+ HREF="#foot917"><SUP>4</SUP></A> object.
</dl>
+
<P>
<dl><dt><b>exception <a name='l2h-98'><tt class='exception'>Error</tt></a></b>
<dd>
This exception is used as a base class for the other SSL-related
exceptions, but may also be raised directly.
-</EM></EM></EM>
+
<P>
-<EM><EM><EM>Whenever this exception is raised directly, it has a list of error messages
+Whenever this exception is raised directly, it has a list of error messages
from the OpenSSL error queue, where each item is a tuple <code>(<var>lib</var>,
<var>function</var>, <var>reason</var>)</code>. Here <var>lib</var>, <var>function</var> and <var>reason</var>
are all strings, describing where and what the problem is. See <span class='manpage'><i>err</i>(3)</span>
for more information.
</dl>
+
<P>
<dl><dt><b>exception <a name='l2h-99'><tt class='exception'>ZeroReturnError</tt></a></b>
<dd>
@@ -136,11 +146,12 @@
only occurs if a closure alert has occurred in the protocol, i.e. the
connection has been closed cleanly. Note that this does not necessarily
mean that the transport layer (e.g. a socket) has been closed.
-</EM></EM></EM>
+
<P>
-<EM><EM><EM>It may seem a little strange that this is an exception, but it does match an
+It may seem a little strange that this is an exception, but it does match an
<code>SSL_ERROR</code> code, and is very convenient.
</dl>
+
<P>
<dl><dt><b>exception <a name='l2h-100'><tt class='exception'>WantReadError</tt></a></b>
<dd>
@@ -148,11 +159,13 @@
later, with the same arguments. Any I/O method can lead to this since new
handshakes can occur at any time.
</dl>
+
<P>
<dl><dt><b>exception <a name='l2h-101'><tt class='exception'>WantWriteError</tt></a></b>
<dd>
See <tt class="exception">WantReadError</tt>.
</dl>
+
<P>
<dl><dt><b>exception <a name='l2h-102'><tt class='exception'>WantX509LookupError</tt></a></b>
<dd>
@@ -161,6 +174,7 @@
arguments. Note: This won't occur in this version, as there are no such
callbacks in this version.
</dl>
+
<P>
<dl><dt><b>exception <a name='l2h-103'><tt class='exception'>SysCallError</tt></a></b>
<dd>
@@ -170,10 +184,11 @@
The parameter to the exception is always a pair <code>(<var>errnum</var>,
<var>errstr</var>)</code>.
</dl>
+
<P>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot920">... socket</A><A
+<DT><A NAME="foot917">... socket</A><A
href="openssl-ssl.html#tex2html5"><SUP>4</SUP></A></DT>
<DD>Actually, all that is required is an object that
<i>behaves</i> like a socket, you could even use files, even though it'd be
diff --git a/doc/html/openssl-x509.html b/doc/html/openssl-x509.html
index 47b1079..d54f991 100644
--- a/doc/html/openssl-x509.html
+++ b/doc/html/openssl-x509.html
@@ -54,80 +54,109 @@
<P>
<dl><dt><b><a name='l2h-34'><tt class='method'>get_issuer</tt></a></b>()
<dd>
-Return a <EM>borrowed reference to a X509Name object representing the issuer
-of the certificate. When the corresponding X509 or X509Req object is
-destroyed, this object will be invalid!
+Return an X509Name object representing the issuer of the certificate.
</dl>
-</EM>
-<P><dl><dt><b><a name='l2h-35'><tt class='method'>get_pubkey</tt></a></b>()
+
+<P>
+<dl><dt><b><a name='l2h-35'><tt class='method'>get_pubkey</tt></a></b>()
<dd>
Return a PKey object representing the public key of the certificate.
</dl>
-<P><dl><dt><b><a name='l2h-36'><tt class='method'>get_serial_number</tt></a></b>()
+
+<P>
+<dl><dt><b><a name='l2h-36'><tt class='method'>get_serial_number</tt></a></b>()
<dd>
Return the certificate serial number.
</dl>
-<P><dl><dt><b><a name='l2h-37'><tt class='method'>get_subject</tt></a></b>()
+
+<P>
+<dl><dt><b><a name='l2h-37'><tt class='method'>get_subject</tt></a></b>()
<dd>
-Return a <EM>borrowed reference to a X509Name object representing the subject
-of the certificate. When the corresponding X509 or X509Req object is
-destroyed, this object will be invalid!
-</dl></EM>
-<P><dl><dt><b><a name='l2h-38'><tt class='method'>get_version</tt></a></b>()
+Return an X509Name object representing the subject of the certificate.
+</dl>
+
+<P>
+<dl><dt><b><a name='l2h-38'><tt class='method'>get_version</tt></a></b>()
<dd>
Return the certificate version.
</dl>
-<P><dl><dt><b><a name='l2h-39'><tt class='method'>gmtime_adj_notBefore</tt></a></b>(<var>time</var>)
+
+<P>
+<dl><dt><b><a name='l2h-39'><tt class='method'>gmtime_adj_notBefore</tt></a></b>(<var>time</var>)
<dd>
Adjust the timestamp (in GMT) when the certificate starts being valid.
</dl>
-<P><dl><dt><b><a name='l2h-40'><tt class='method'>gmtime_adj_notAfter</tt></a></b>(<var>time</var>)
+
+<P>
+<dl><dt><b><a name='l2h-40'><tt class='method'>gmtime_adj_notAfter</tt></a></b>(<var>time</var>)
<dd>
Adjust the timestamp (in GMT) when the certificate stops being valid.
</dl>
-<P><dl><dt><b><a name='l2h-41'><tt class='method'>has_expired</tt></a></b>()
+
+<P>
+<dl><dt><b><a name='l2h-41'><tt class='method'>has_expired</tt></a></b>()
<dd>
Checks the certificate's time stamp against current time. Returns true if the
certificate has expired and false otherwise.
</dl>
-<P><dl><dt><b><a name='l2h-42'><tt class='method'>set_issuer</tt></a></b>(<var>issuer</var>)
+
+<P>
+<dl><dt><b><a name='l2h-42'><tt class='method'>set_issuer</tt></a></b>(<var>issuer</var>)
<dd>
Set the issuer of the certificate to <var>issuer</var>.
</dl>
-<P><dl><dt><b><a name='l2h-43'><tt class='method'>set_pubkey</tt></a></b>(<var>pkey</var>)
+
+<P>
+<dl><dt><b><a name='l2h-43'><tt class='method'>set_pubkey</tt></a></b>(<var>pkey</var>)
<dd>
Set the public key of the certificate to <var>pkey</var>.
</dl>
-<P><dl><dt><b><a name='l2h-44'><tt class='method'>set_serial_number</tt></a></b>(<var>serialno</var>)
+
+<P>
+<dl><dt><b><a name='l2h-44'><tt class='method'>set_serial_number</tt></a></b>(<var>serialno</var>)
<dd>
Set the serial number of the certificate to <var>serialno</var>.
</dl>
-<P><dl><dt><b><a name='l2h-45'><tt class='method'>set_subject</tt></a></b>(<var>subject</var>)
+
+<P>
+<dl><dt><b><a name='l2h-45'><tt class='method'>set_subject</tt></a></b>(<var>subject</var>)
<dd>
Set the subject of the certificate to <var>subject</var>.
</dl>
-<P><dl><dt><b><a name='l2h-46'><tt class='method'>set_version</tt></a></b>(<var>version</var>)
+
+<P>
+<dl><dt><b><a name='l2h-46'><tt class='method'>set_version</tt></a></b>(<var>version</var>)
<dd>
Set the certificate version to <var>version</var>.
</dl>
-<P><dl><dt><b><a name='l2h-47'><tt class='method'>sign</tt></a></b>(<var>pkey, digest</var>)
+
+<P>
+<dl><dt><b><a name='l2h-47'><tt class='method'>sign</tt></a></b>(<var>pkey, digest</var>)
<dd>
Sign the certificate, using the key <var>pkey</var> and the message digest algorithm
identified by the string <var>digest</var>.
</dl>
-<P><dl><dt><b><a name='l2h-48'><tt class='method'>subject_name_hash</tt></a></b>()
+
+<P>
+<dl><dt><b><a name='l2h-48'><tt class='method'>subject_name_hash</tt></a></b>()
<dd>
Return the hash of the certificate subject.
</dl>
-<P><dl><dt><b><a name='l2h-49'><tt class='method'>digest</tt></a></b>(<var>digest_name</var>)
+
+<P>
+<dl><dt><b><a name='l2h-49'><tt class='method'>digest</tt></a></b>(<var>digest_name</var>)
<dd>
Return a digest of the certificate, using the <var>digest_name</var> method.
</dl>
-<P><dl><dt><b><a name='l2h-50'><tt class='method'>add_extensions</tt></a></b>(<var>extensions</var>)
+
+<P>
+<dl><dt><b><a name='l2h-50'><tt class='method'>add_extensions</tt></a></b>(<var>extensions</var>)
<dd>
Add the extensions in the sequence <var>extensions</var> to the certificate.
</dl>
+
<P>
+
<DIV CLASS="navigation">
<p><hr>
<table align="center" width="100%" cellpadding="0" cellspacing="2">
diff --git a/doc/html/openssl-x509name.html b/doc/html/openssl-x509name.html
index 4851e4c..a5fc92e 100644
--- a/doc/html/openssl-x509name.html
+++ b/doc/html/openssl-x509name.html
@@ -47,44 +47,60 @@
<BR>
3.1.2 X509Name objects
</H3>
+
<P>
-<EM><EM>X509Name objects have the following members:
-</EM></EM>
-<P><dl><dt><b><a name='l2h-51'><tt class='member'>countryName</tt></a></b>
+X509Name objects have the following members:
+
+<P>
+<dl><dt><b><a name='l2h-51'><tt class='member'>countryName</tt></a></b>
<dd>
The country of the entity. <code>C</code> may be used as an alias for
<code>countryName</code>.
</dl>
-<P><dl><dt><b><a name='l2h-52'><tt class='member'>stateOrProvinceName</tt></a></b>
+
+<P>
+<dl><dt><b><a name='l2h-52'><tt class='member'>stateOrProvinceName</tt></a></b>
<dd>
The state or province of the entity. <code>ST</code> may be used as an alias for
<code>stateOrProvinceName</code>·
</dl>
-<P><dl><dt><b><a name='l2h-53'><tt class='member'>localityName</tt></a></b>
+
+<P>
+<dl><dt><b><a name='l2h-53'><tt class='member'>localityName</tt></a></b>
<dd>
The locality of the entity. <code>L</code> may be used as an alias for
<code>localityName</code>.
</dl>
-<P><dl><dt><b><a name='l2h-54'><tt class='member'>organizationName</tt></a></b>
+
+<P>
+<dl><dt><b><a name='l2h-54'><tt class='member'>organizationName</tt></a></b>
<dd>
The organization name of the entity. <code>O</code> may be used as an alias for
<code>organizationName</code>.
</dl>
-<P><dl><dt><b><a name='l2h-55'><tt class='member'>organizationalUnitName</tt></a></b>
+
+<P>
+<dl><dt><b><a name='l2h-55'><tt class='member'>organizationalUnitName</tt></a></b>
<dd>
The organizational unit of the entity. <code>OU</code> may be used as an alias for
<code>organizationalUnitName</code>.
</dl>
-<P><dl><dt><b><a name='l2h-56'><tt class='member'>commonName</tt></a></b>
+
+<P>
+<dl><dt><b><a name='l2h-56'><tt class='member'>commonName</tt></a></b>
<dd>
The common name of the entity. <code>CN</code> may be used as an alias for
<code>commonName</code>.
</dl>
-<P><dl><dt><b><a name='l2h-57'><tt class='member'>emailAddress</tt></a></b>
+
+<P>
+<dl><dt><b><a name='l2h-57'><tt class='member'>emailAddress</tt></a></b>
<dd>
The e-mail address of the entity.
</dl>
+
<P>
+
<DIV CLASS="navigation">
<p><hr>
<table align="center" width="100%" cellpadding="0" cellspacing="2">
diff --git a/doc/html/openssl-x509req.html b/doc/html/openssl-x509req.html
index e65c246..0cc88c4 100644
--- a/doc/html/openssl-x509req.html
+++ b/doc/html/openssl-x509req.html
@@ -47,35 +47,41 @@
<BR>
3.1.3 X509Req objects
</H3>
+
<P>
-<EM><EM>X509Req objects have the following methods:
-</EM></EM>
-<P><dl><dt><b><a name='l2h-58'><tt class='method'>get_pubkey</tt></a></b>()
+X509Req objects have the following methods:
+
+<P>
+<dl><dt><b><a name='l2h-58'><tt class='method'>get_pubkey</tt></a></b>()
<dd>
Return a PKey object representing the public key of the certificate request.
</dl>
-<P><dl><dt><b><a name='l2h-59'><tt class='method'>get_subject</tt></a></b>()
+
+<P>
+<dl><dt><b><a name='l2h-59'><tt class='method'>get_subject</tt></a></b>()
<dd>
-Return a <EM>borrowed reference to a X509Name object representing the subject
-of the certificate. When the corresponding X509 or X509Req object is
-destroyed, this object will be invalid!
-</dl></EM>
+Return an X509Name object representing the subject of the certificate.
+</dl>
+
<P>
<dl><dt><b><a name='l2h-60'><tt class='method'>set_pubkey</tt></a></b>(<var>pkey</var>)
<dd>
Set the public key of the certificate request to <var>pkey</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-61'><tt class='method'>sign</tt></a></b>(<var>pkey, digest</var>)
<dd>
Sign the certificate request, using the key <var>pkey</var> and the message digest
algorithm identified by the string <var>digest</var>.
</dl>
+
<P>
<dl><dt><b><a name='l2h-62'><tt class='method'>verify</tt></a></b>(<var>pkey</var>)
<dd>
Verify a certificate request using the public key <var>pkey</var>.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/openssl-x509store.html b/doc/html/openssl-x509store.html
index cd68eca..64fb2f3 100644
--- a/doc/html/openssl-x509store.html
+++ b/doc/html/openssl-x509store.html
@@ -47,14 +47,16 @@
<BR>
3.1.4 X509Store objects
</H3>
+
<P>
-<EM><EM><EM>The X509Store object has currently just one method:
-</EM></EM></EM>
+The X509Store object has currently just one method:
+
<P>
<dl><dt><b><a name='l2h-63'><tt class='method'>add_cert</tt></a></b>(<var>cert</var>)
<dd>
Add the certificate <var>cert</var> to the certificate store.
</dl>
+
<P>
<DIV CLASS="navigation">
diff --git a/doc/html/socket-methods.html b/doc/html/socket-methods.html
index d2958f2..cc43406 100644
--- a/doc/html/socket-methods.html
+++ b/doc/html/socket-methods.html
@@ -46,8 +46,9 @@
<BR>
4.3 Acessing Socket Methods
</H2>
+
<P>
-<EM><EM><EM>We quickly saw the benefit of wrapping socket methods in the
+We quickly saw the benefit of wrapping socket methods in the
<tt class="class">SSL.Connection</tt> class, for an easy transition into using SSL. The
problem here is that the <tt class="module">socket</tt> module lacks a C API, and all the
methods are declared static. One approach would be to have <tt class="module">OpenSSL</tt> as
@@ -58,9 +59,9 @@
pointer to the method to be called, either the C function, or a callable Python
object. This is not really a good solution either, since there's a lot of
lookups involved.
-</EM></EM></EM>
+
<P>
-<EM><EM><EM>The way it works is that you have to supply a ``<tt class="class">socket</tt>-like'' transport
+The way it works is that you have to supply a ``<tt class="class">socket</tt>-like'' transport
object to the <tt class="class">SSL.Connection</tt>. The only requirement of this object is
that it has a <tt class="method">fileno()</tt> method that returns a file descriptor that's
valid at the C level (i.e. you can use the system calls read and write). If you
@@ -68,9 +69,9 @@
<tt class="class">SSL.Connection</tt> object, the transport object has to supply such
methods too. Apart from them, any method lookups in the <tt class="class">SSL.Connection</tt>
object that fail are passed on to the underlying transport object.
-</EM></EM></EM>
+
<P>
-<EM><EM><EM>Future changes might be to allow Python-level transport objects, that instead
+Future changes might be to allow Python-level transport objects, that instead
of having <tt class="method">fileno()</tt> methods, have <tt class="method">read()</tt> and <tt class="method">write()</tt>
methods, so more advanced features of Python can be used. This would probably
entail some sort of OpenSSL ``BIOs'', but converting Python strings back and
@@ -79,7 +80,7 @@
and writing, but then the <tt class="method">fileno()</tt> method of <tt class="class">SSL.Connection</tt>
becomes virtually useless. Also, should the method resolution be used on the
read-transport or the write-transport?
-</EM></EM></EM>
+
<P>
<DIV CLASS="navigation">