Correct documentation for Context.check_privatekey
diff --git a/doc/html/callbacks.html b/doc/html/callbacks.html
index 16911b5..26dbb10 100644
--- a/doc/html/callbacks.html
+++ b/doc/html/callbacks.html
@@ -56,7 +56,7 @@
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="#foot932"><SUP>5</SUP></A>.
+ HREF="#foot934"><SUP>5</SUP></A>.
<P>
There are two solutions to the first problem, both of which are necessary. The
@@ -84,7 +84,7 @@
<P>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot932">... back</A><A
+<DT><A NAME="foot934">... 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/intro.html b/doc/html/intro.html
index 8ad4884..e57f6f2 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="#foot892"><SUP>1</SUP></A> is
+ HREF="#foot894"><SUP>1</SUP></A> is
developed using SWIG<A NAME="tex2html2"
- HREF="#foot893"><SUP>2</SUP></A>. This
+ HREF="#foot895"><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="foot892">... M2Crypto</A><A
+<DT><A NAME="foot894">... 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="foot893">... SWIG</A><A
+<DT><A NAME="foot895">... 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-context.html b/doc/html/openssl-context.html
index 4af8a66..c2b9b56 100644
--- a/doc/html/openssl-context.html
+++ b/doc/html/openssl-context.html
@@ -56,7 +56,7 @@
<dd>
Check if the private key (loaded with <tt class="method">use_privatekey<big>[</big>_file<big>]</big></tt>)
matches the certificate (loaded with <tt class="method">use_certificate<big>[</big>_file<big>]</big></tt>).
-Returns true if they match, false otherwise.
+Returns <code>None</code> if they match, raises <tt class="exception">Error</tt> otherwise.
</dl>
<P>
diff --git a/doc/html/openssl-rand.html b/doc/html/openssl-rand.html
index 19cb25e..bc72ab9 100644
--- a/doc/html/openssl-rand.html
+++ b/doc/html/openssl-rand.html
@@ -60,7 +60,7 @@
<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-1793"
+<var>string</var>, measured in bytes. For more information, see e.g. <a class="rfc" name="rfcref-1795"
href="http://www.ietf.org/rfc/rfc1750.txt">RFC 1750</a>.
</dl>
@@ -68,7 +68,7 @@
<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="#foot914"><SUP>3</SUP></A> on socket <var>path</var> for <var>bytes</var>
+ HREF="#foot916"><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>
@@ -110,7 +110,7 @@
<P>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot914">... Daemon</A><A
+<DT><A NAME="foot916">... 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 0feb9e4..1a459a1 100644
--- a/doc/html/openssl-ssl.html
+++ b/doc/html/openssl-ssl.html
@@ -121,7 +121,7 @@
<dd>
Factory fucnction that creates a new Connection object given an SSL context and
a socket <A NAME="tex2html5"
- HREF="#foot917"><SUP>4</SUP></A> object.
+ HREF="#foot919"><SUP>4</SUP></A> object.
</dl>
<P>
@@ -188,7 +188,7 @@
<P>
<BR><HR><H4>Footnotes</H4>
<DL>
-<DT><A NAME="foot917">... socket</A><A
+<DT><A NAME="foot919">... 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/pyOpenSSL.ps b/doc/pyOpenSSL.ps
index dc1723a..2805cb4 100644
--- a/doc/pyOpenSSL.ps
+++ b/doc/pyOpenSSL.ps
@@ -1,7 +1,7 @@
%!PS-Adobe-2.0
%%Creator: dvips(k) 5.96.1 Copyright 2007 Radical Eye Software
%%Title: pyOpenSSL.dvi
-%%CreationDate: Thu Mar 6 21:36:22 2008
+%%CreationDate: Thu Mar 6 21:51:40 2008
%%Pages: 14
%%PageOrder: Ascend
%%BoundingBox: 0 0 595 842
@@ -10,7 +10,7 @@
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -N0 -o pyOpenSSL.ps pyOpenSSL
%DVIPSParameters: dpi=600
-%DVIPSSource: TeX output 2008.03.06:2135
+%DVIPSSource: TeX output 2008.03.06:2151
%%BeginProcSet: tex.pro 0 0
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -5059,13 +5059,13 @@
(with)h Fm(use_privatekey)p Fc([)p Fm(_)o(fi)o(le)11
b Fc(])p Fr(\))26 b(matc)n(hes)k(the)i(certi\034cate)f(\(loaded)g(with)
208 674 y Fm(use_certificate)o Fc([)p Fm(_)o(fil)o(e)11
-b Fc(])p Fr(\).)31 b(Returns)d(true)f(if)h(they)g(matc)n(h,)f(false)h
-(otherwise.)0 821 y Fm(get_app_data\(\))208 921 y Fr(Retriev)n(e)e
-(application)h(data)g(as)g(set)h(b)n(y)g Fm(set_app_data)p
-Fr(.)0 1068 y Fm(get_cert_store\(\))208 1167 y Fr(Retriev)n(e)34
-b(the)i(certi\034cate)f(store)f(\(a)h(X509Store)f(ob)5
-b(ject\))35 b(that)h(the)f(con)n(text)g(uses.)60 b(This)35
-b(can)g(b)r(e)h(used)f(to)g(add)208 1267 y("trusted")26
+b Fc(])p Fr(\).)31 b(Returns)d Fm(None)e Fr(if)i(they)f(matc)n(h,)h
+(raises)e Fm(Error)g Fr(otherwise.)0 821 y Fm(get_app_data\(\))208
+921 y Fr(Retriev)n(e)g(application)h(data)g(as)g(set)h(b)n(y)g
+Fm(set_app_data)p Fr(.)0 1068 y Fm(get_cert_store\(\))208
+1167 y Fr(Retriev)n(e)34 b(the)i(certi\034cate)f(store)f(\(a)h
+(X509Store)f(ob)5 b(ject\))35 b(that)h(the)f(con)n(text)g(uses.)60
+b(This)35 b(can)g(b)r(e)h(used)f(to)g(add)208 1267 y("trusted")26
b(certi\034cates)h(without)h(using)f(the.)37 b Fm(load_verify_loca)o
(tio)o(ns)o(\(\))21 b Fr(metho)r(d.)0 1414 y Fm(get_timeout\(\))208
1513 y Fr(Retriev)n(e)26 b(session)h(timeout,)h(as)f(set)g(b)n(y)i
diff --git a/doc/pyOpenSSL.tex b/doc/pyOpenSSL.tex
index 9b68869..9e8376c 100644
--- a/doc/pyOpenSSL.tex
+++ b/doc/pyOpenSSL.tex
@@ -671,7 +671,7 @@
\begin{methoddesc}[Context]{check_privatekey}{}
Check if the private key (loaded with \method{use_privatekey\optional{_file}})
matches the certificate (loaded with \method{use_certificate\optional{_file}}).
-Returns true if they match, false otherwise.
+Returns \code{None} if they match, raises \exception{Error} otherwise.
\end{methoddesc}
\begin{methoddesc}[Context]{get_app_data}{}
diff --git a/doc/pyOpenSSL.txt b/doc/pyOpenSSL.txt
index 695c9fd..0fddc05 100644
--- a/doc/pyOpenSSL.txt
+++ b/doc/pyOpenSSL.txt
@@ -591,7 +591,7 @@
check_privatekey()
Check if the private key (loaded with use_privatekey[_file])
matches the certificate (loaded with use_certificate[_file]).
- Returns true if they match, false otherwise.
+ Returns None if they match, raises Error otherwise.
get_app_data()
Retrieve application data as set by set_app_data.