/[pkg-src]/trunk/openssl/patches/openssl-1.0.0a-fix-manpages.patch

Diff of /trunk/openssl/patches/openssl-1.0.0a-fix-manpages.patch

Parent Directory | Revision Log | View Patch Patch

-revision 1084 by niro,
Tue Aug 17 22:40:33 2010 UTC
+revision 1085 by niro,
Tue Aug 17 22:46:32 2010 UTC
 Line 1
- Submitted By: Robert Connolly <robert at linuxfromscratch dot org>
+ --- crypto/rand/md_rand.c	2009-01-03 10:25:32.000000000 +0100
- Date: 2005-11-13
+ +++ crypto/rand/md_rand.c	2010-04-01 00:45:00.746327192 +0200
- Initial Package Version: 0.9.8a
- Upstream Status: Submitted upstream
- Origin: Anderson Lizardo
- Description: This patch fixes conflicts between man pages
- 	     installed by OpenSSL and those found on other
- 	     packages (particulary Shadow, Perl, and
- 	     Man-pages). It also fixes syntax errors on some
- 	     POD files that generates slightly broken man
- 	     pages.
- $LastChangedBy: igor $
- $Date: 2010-08-17 22:40:33 $
- diff -Naur openssl-0.9.8a.orig/FAQ openssl-0.9.8a/FAQ
- --- openssl-0.9.8a.orig/FAQ	2005-10-11 10:16:06.000000000 +0000
- +++ openssl-0.9.8a/FAQ	2005-11-14 03:59:59.000000000 +0000
- @@ -680,7 +680,7 @@
-  Multi-threaded applications must provide two callback functions to
-  OpenSSL by calling CRYPTO_set_locking_callback() and
- -CRYPTO_set_id_callback().  This is described in the threads(3)
- +CRYPTO_set_id_callback().  This is described in the openssl_threads(3)
-  manpage.
-  * I've compiled a program under Windows and it crashes: why?
- diff -Naur openssl-0.9.8a.orig/crypto/rand/md_rand.c openssl-0.9.8a/crypto/rand/md_rand.c
- --- openssl-0.9.8a.orig/crypto/rand/md_rand.c	2005-04-07 22:53:35.000000000 +0000
- +++ openssl-0.9.8a/crypto/rand/md_rand.c	2005-11-14 03:59:59.000000000 +0000
  @@ -196,7 +196,7 @@
   	int do_not_lock;
-Line 37 
 diff -Naur openssl-0.9.8a.orig/crypto/ra
+Line 9 
 diff -Naur openssl-0.9.8a.orig/crypto/ra
   	 *
   	 * The input is chopped up into units of 20 bytes (or less for
   	 * the last block).  Each of these blocks is run through the hash
- @@ -351,7 +351,7 @@
+ @@ -361,7 +361,7 @@
   	num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2);
   	/*
-Line 46 
 diff -Naur openssl-0.9.8a.orig/crypto/ra
+Line 18 
 diff -Naur openssl-0.9.8a.orig/crypto/ra
   	 *
   	 * For each group of 10 bytes (or less), we do the following:
   	 *
- diff -Naur openssl-0.9.8a.orig/doc/apps/openssl-passwd.pod openssl-0.9.8a/doc/apps/openssl-passwd.pod
+ --- doc/apps/openssl-passwd.pod	1970-01-01 01:00:00.000000000 +0100
- --- openssl-0.9.8a.orig/doc/apps/openssl-passwd.pod	1970-01-01 00:00:00.000000000 +0000
+ +++ doc/apps/openssl-passwd.pod	2010-04-01 00:45:00.796327220 +0200
- +++ openssl-0.9.8a/doc/apps/openssl-passwd.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -0,0 +1,82 @@
  +=pod
  +
-Line 132 
 diff -Naur openssl-0.9.8a.orig/doc/apps/
+Line 103 
 diff -Naur openssl-0.9.8a.orig/doc/apps/
  +B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
  +
  +=cut
- diff -Naur openssl-0.9.8a.orig/doc/apps/openssl.pod openssl-0.9.8a/doc/apps/openssl.pod
+ --- doc/apps/openssl.pod	2010-01-21 19:46:28.000000000 +0100
- --- openssl-0.9.8a.orig/doc/apps/openssl.pod	2004-01-04 18:59:14.000000000 +0000
+ +++ doc/apps/openssl.pod	2010-04-01 00:45:00.796327220 +0200
- +++ openssl-0.9.8a/doc/apps/openssl.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -163,7 +163,7 @@
- @@ -125,7 +125,7 @@
   Online Certificate Status Protocol utility.
-Line 144 
 diff -Naur openssl-0.9.8a.orig/doc/apps/
+Line 114 
 diff -Naur openssl-0.9.8a.orig/doc/apps/
   Generation of hashed passwords.
- @@ -325,7 +325,7 @@
+ @@ -401,7 +401,7 @@
   L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>,
-  L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>,
+  L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>,
   L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>,
  -L<passwd(1)|passwd(1)>,
  +L<openssl-passwd(1)|openssl-passwd(1)>,
   L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>,
   L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
   L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
- diff -Naur openssl-0.9.8a.orig/doc/apps/passwd.pod openssl-0.9.8a/doc/apps/passwd.pod
+ --- doc/apps/passwd.pod	2002-10-04 14:59:00.000000000 +0200
- --- openssl-0.9.8a.orig/doc/apps/passwd.pod	2002-10-04 12:59:00.000000000 +0000
+ +++ doc/apps/passwd.pod	1970-01-01 01:00:00.000000000 +0100
- +++ openssl-0.9.8a/doc/apps/passwd.pod	1970-01-01 00:00:00.000000000 +0000
  @@ -1,82 +0,0 @@
  -=pod
  -
-Line 239 
 diff -Naur openssl-0.9.8a.orig/doc/apps/
+Line 208 
 diff -Naur openssl-0.9.8a.orig/doc/apps/
  -B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>.
  -
  -=cut
- diff -Naur openssl-0.9.8a.orig/doc/crypto/BN_generate_prime.pod openssl-0.9.8a/doc/crypto/BN_generate_prime.pod
+ --- doc/crypto/BN_generate_prime.pod	2003-01-13 14:18:22.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/BN_generate_prime.pod	2003-01-13 13:18:22.000000000 +0000
+ +++ doc/crypto/BN_generate_prime.pod	2010-04-01 00:45:00.824035190 +0200
- +++ openssl-0.9.8a/doc/crypto/BN_generate_prime.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -90,7 +90,7 @@
   =head1 SEE ALSO
-Line 251 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 219 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/BN_rand.pod openssl-0.9.8a/doc/crypto/BN_rand.pod
+ --- doc/crypto/bn.pod	2008-07-03 21:59:24.000000000 +0200
- --- openssl-0.9.8a.orig/doc/crypto/BN_rand.pod	2002-09-25 13:33:26.000000000 +0000
+ +++ doc/crypto/bn.pod	2010-04-01 00:45:01.022993777 +0200
- +++ openssl-0.9.8a/doc/crypto/BN_rand.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -167,7 +167,7 @@
+  =head1 SEE ALSO
+  L<bn_internal(3)|bn_internal(3)>,
+ -L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
+ +L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
+  L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>,
+  L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>,
+  L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>,
+ --- doc/crypto/BN_rand.pod	2002-09-25 15:33:26.000000000 +0200
+ +++ doc/crypto/BN_rand.pod	2010-04-01 00:45:00.824035190 +0200
  @@ -45,7 +45,7 @@
   =head1 SEE ALSO
-Line 263 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 241 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/CONF_modules_free.pod openssl-0.9.8a/doc/crypto/CONF_modules_free.pod
+ --- doc/crypto/CONF_modules_free.pod	2006-12-21 22:13:27.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/CONF_modules_free.pod	2004-03-02 13:31:32.000000000 +0000
+ +++ doc/crypto/CONF_modules_free.pod	2010-04-01 00:45:00.827162198 +0200
- +++ openssl-0.9.8a/doc/crypto/CONF_modules_free.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -37,7 +37,7 @@
   =head1 SEE ALSO
-Line 275 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 252 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/CONF_modules_load_file.pod openssl-0.9.8a/doc/crypto/CONF_modules_load_file.pod
+ --- doc/crypto/CONF_modules_load_file.pod	2004-03-02 14:31:32.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/CONF_modules_load_file.pod	2004-03-02 13:31:32.000000000 +0000
+ +++ doc/crypto/CONF_modules_load_file.pod	2010-04-01 00:45:00.833827289 +0200
- +++ openssl-0.9.8a/doc/crypto/CONF_modules_load_file.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -51,7 +51,7 @@
   =head1 SEE ALSO
-Line 287 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 263 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/DH_generate_key.pod openssl-0.9.8a/doc/crypto/DH_generate_key.pod
+ --- doc/crypto/crypto.pod	2002-10-06 14:59:25.000000000 +0200
- --- openssl-0.9.8a.orig/doc/crypto/DH_generate_key.pod	2002-09-25 13:33:27.000000000 +0000
+ +++ doc/crypto/crypto.pod	2010-04-01 00:45:01.029660428 +0200
- +++ openssl-0.9.8a/doc/crypto/DH_generate_key.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -46,7 +46,7 @@
+  =item AUXILIARY FUNCTIONS
+ -L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>,
+ +L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>,
+  L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)>
+  =item INPUT/OUTPUT, DATA ENCODING
+ --- doc/crypto/des.pod	2003-10-01 17:02:45.000000000 +0200
+ +++ doc/crypto/des.pod	2010-04-01 00:45:01.036327160 +0200
+ @@ -115,7 +115,7 @@
+  the key; it is used to speed the encryption process.
+  DES_random_key() generates a random key.  The PRNG must be seeded
+ -prior to using this function (see L<rand(3)|rand(3)>).  If the PRNG
+ +prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>).  If the PRNG
+  could not generate a secure key, 0 is returned.
+  Before a DES key can be used, it must be converted into the
+ @@ -317,7 +317,7 @@
+  =head1 SEE ALSO
+ -crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
+ +crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>
+  =head1 HISTORY
+ --- doc/crypto/DH_generate_key.pod	2002-09-25 15:33:27.000000000 +0200
+ +++ doc/crypto/DH_generate_key.pod	2010-04-01 00:45:00.840494142 +0200
  @@ -40,7 +40,7 @@
   =head1 SEE ALSO
-Line 299 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 305 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/DH_generate_parameters.pod openssl-0.9.8a/doc/crypto/DH_generate_parameters.pod
+ --- doc/crypto/DH_generate_parameters.pod	2002-09-25 15:33:27.000000000 +0200
- --- openssl-0.9.8a.orig/doc/crypto/DH_generate_parameters.pod	2002-09-25 13:33:27.000000000 +0000
+ +++ doc/crypto/DH_generate_parameters.pod	2010-04-01 00:45:00.847161913 +0200
- +++ openssl-0.9.8a/doc/crypto/DH_generate_parameters.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -59,7 +59,7 @@
   =head1 SEE ALSO
-Line 311 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 316 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<DH_free(3)|DH_free(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/DSA_do_sign.pod openssl-0.9.8a/doc/crypto/DSA_do_sign.pod
+ --- doc/crypto/dh.pod	2002-08-05 18:27:01.000000000 +0200
- --- openssl-0.9.8a.orig/doc/crypto/DSA_do_sign.pod	2002-09-25 13:33:27.000000000 +0000
+ +++ doc/crypto/dh.pod	2010-04-01 00:45:01.036327160 +0200
- +++ openssl-0.9.8a/doc/crypto/DSA_do_sign.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -67,8 +67,8 @@
+  =head1 SEE ALSO
+ -L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>,
+ -L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
+ +L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>,
+ +L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
+  L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>,
+  L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>,
+  L<DH_generate_parameters(3)|DH_generate_parameters(3)>,
+ --- doc/crypto/DSA_do_sign.pod	2002-09-25 15:33:27.000000000 +0200
+ +++ doc/crypto/DSA_do_sign.pod	2010-04-01 00:45:00.847161913 +0200
  @@ -36,7 +36,7 @@
   =head1 SEE ALSO
-Line 323 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 340 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<DSA_SIG_new(3)|DSA_SIG_new(3)>,
   L<DSA_sign(3)|DSA_sign(3)>
- diff -Naur openssl-0.9.8a.orig/doc/crypto/DSA_generate_key.pod openssl-0.9.8a/doc/crypto/DSA_generate_key.pod
+ --- doc/crypto/DSA_generate_key.pod	2002-09-25 15:33:27.000000000 +0200
- --- openssl-0.9.8a.orig/doc/crypto/DSA_generate_key.pod	2002-09-25 13:33:27.000000000 +0000
+ +++ doc/crypto/DSA_generate_key.pod	2010-04-01 00:45:00.847161913 +0200
- +++ openssl-0.9.8a/doc/crypto/DSA_generate_key.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -24,7 +24,7 @@
   =head1 SEE ALSO
-Line 335 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 351 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<DSA_generate_parameters(3)|DSA_generate_parameters(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/DSA_generate_parameters.pod openssl-0.9.8a/doc/crypto/DSA_generate_parameters.pod
+ --- doc/crypto/DSA_generate_parameters.pod	2002-09-25 15:33:27.000000000 +0200
- --- openssl-0.9.8a.orig/doc/crypto/DSA_generate_parameters.pod	2002-09-25 13:33:27.000000000 +0000
+ +++ doc/crypto/DSA_generate_parameters.pod	2010-04-01 00:45:00.847161913 +0200
- +++ openssl-0.9.8a/doc/crypto/DSA_generate_parameters.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -90,7 +90,7 @@
   =head1 SEE ALSO
-Line 347 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 362 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<DSA_free(3)|DSA_free(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/DSA_sign.pod openssl-0.9.8a/doc/crypto/DSA_sign.pod
+ --- doc/crypto/dsa.pod	2002-08-05 18:27:01.000000000 +0200
- --- openssl-0.9.8a.orig/doc/crypto/DSA_sign.pod	2002-09-25 13:33:27.000000000 +0000
+ +++ doc/crypto/dsa.pod	2010-04-01 00:45:01.042994012 +0200
- +++ openssl-0.9.8a/doc/crypto/DSA_sign.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -100,7 +100,7 @@
+  =head1 SEE ALSO
+ -L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>,
+ +L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>,
+  L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>,
+  L<DSA_new(3)|DSA_new(3)>,
+  L<DSA_size(3)|DSA_size(3)>,
+ --- doc/crypto/DSA_sign.pod	2002-09-25 15:33:27.000000000 +0200
+ +++ doc/crypto/DSA_sign.pod	2010-04-01 00:45:00.847161913 +0200
  @@ -55,7 +55,7 @@
   =head1 SEE ALSO
-Line 359 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 384 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<DSA_do_sign(3)|DSA_do_sign(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_GET_LIB.pod openssl-0.9.8a/doc/crypto/ERR_GET_LIB.pod
+ --- doc/crypto/engine.pod	2007-11-19 10:18:03.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/ERR_GET_LIB.pod	2000-02-01 01:36:58.000000000 +0000
+ +++ doc/crypto/engine.pod	2010-04-01 00:45:01.049660583 +0200
- +++ openssl-0.9.8a/doc/crypto/ERR_GET_LIB.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -594,6 +594,6 @@
- @@ -41,7 +41,7 @@
   =head1 SEE ALSO
- -L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
+ -L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)>
- +L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
+ +L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_clear_error.pod openssl-0.9.8a/doc/crypto/ERR_clear_error.pod
+  =cut
- --- openssl-0.9.8a.orig/doc/crypto/ERR_clear_error.pod	2000-02-01 01:36:58.000000000 +0000
+ --- doc/crypto/ERR_clear_error.pod	2000-02-01 02:36:58.000000000 +0100
- +++ openssl-0.9.8a/doc/crypto/ERR_clear_error.pod	2005-11-14 03:59:59.000000000 +0000
+ +++ doc/crypto/ERR_clear_error.pod	2010-04-01 00:45:00.857161750 +0200
  @@ -20,7 +20,7 @@
   =head1 SEE ALSO
-Line 383 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 405 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_error_string.pod openssl-0.9.8a/doc/crypto/ERR_error_string.pod
+ --- doc/crypto/ERR_error_string.pod	2004-11-14 16:11:37.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/ERR_error_string.pod	2004-11-14 15:11:37.000000000 +0000
+ +++ doc/crypto/ERR_error_string.pod	2010-04-01 00:45:00.863828202 +0200
- +++ openssl-0.9.8a/doc/crypto/ERR_error_string.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -60,7 +60,7 @@
   =head1 SEE ALSO
-Line 395 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 416 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
   L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
   L<ERR_print_errors(3)|ERR_print_errors(3)>
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_get_error.pod openssl-0.9.8a/doc/crypto/ERR_get_error.pod
+ --- doc/crypto/ERR_get_error.pod	2002-11-29 15:21:54.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/ERR_get_error.pod	2002-11-29 14:21:54.000000000 +0000
+ +++ doc/crypto/ERR_get_error.pod	2010-04-01 00:45:00.870494614 +0200
- +++ openssl-0.9.8a/doc/crypto/ERR_get_error.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -61,7 +61,7 @@
   =head1 SEE ALSO
-Line 407 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 427 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_load_crypto_strings.pod openssl-0.9.8a/doc/crypto/ERR_load_crypto_strings.pod
+ --- doc/crypto/ERR_GET_LIB.pod	2000-02-01 02:36:58.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/ERR_load_crypto_strings.pod	2000-02-24 11:55:08.000000000 +0000
+ +++ doc/crypto/ERR_GET_LIB.pod	2010-04-01 00:45:00.850495218 +0200
- +++ openssl-0.9.8a/doc/crypto/ERR_load_crypto_strings.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -41,7 +41,7 @@
- @@ -35,7 +35,7 @@
-  =head1 SEE ALSO
- -L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
- +L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_load_strings.pod openssl-0.9.8a/doc/crypto/ERR_load_strings.pod
- --- openssl-0.9.8a.orig/doc/crypto/ERR_load_strings.pod	2000-02-24 11:55:08.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/ERR_load_strings.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -43,7 +43,7 @@
-  =head1 SEE ALSO
- -L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
- +L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_print_errors.pod openssl-0.9.8a/doc/crypto/ERR_print_errors.pod
- --- openssl-0.9.8a.orig/doc/crypto/ERR_print_errors.pod	2000-02-01 01:36:59.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/ERR_print_errors.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -38,7 +38,7 @@
-  =head1 SEE ALSO
- -L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
- +L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
-  L<ERR_get_error(3)|ERR_get_error(3)>,
-  L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
-  L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_put_error.pod openssl-0.9.8a/doc/crypto/ERR_put_error.pod
- --- openssl-0.9.8a.orig/doc/crypto/ERR_put_error.pod	2000-02-24 11:55:08.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/ERR_put_error.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -34,7 +34,7 @@
-  =head1 SEE ALSO
- -L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
- +L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/ERR_remove_state.pod openssl-0.9.8a/doc/crypto/ERR_remove_state.pod
- --- openssl-0.9.8a.orig/doc/crypto/ERR_remove_state.pod	2000-05-19 07:54:42.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/ERR_remove_state.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -25,7 +25,7 @@
-  =head1 SEE ALSO
- -L<err(3)|err(3)>
- +L<openssl_err(3)|openssl_err(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/EVP_BytesToKey.pod openssl-0.9.8a/doc/crypto/EVP_BytesToKey.pod
- --- openssl-0.9.8a.orig/doc/crypto/EVP_BytesToKey.pod	2004-11-25 17:47:30.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/EVP_BytesToKey.pod	2005-11-14 04:00:45.000000000 +0000
- @@ -59,7 +59,7 @@
-  =head1 SEE ALSO
- -L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
- +L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
-  L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/EVP_OpenInit.pod openssl-0.9.8a/doc/crypto/EVP_OpenInit.pod
- --- openssl-0.9.8a.orig/doc/crypto/EVP_OpenInit.pod	2000-09-23 07:16:14.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/EVP_OpenInit.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -54,7 +54,7 @@
-  =head1 SEE ALSO
- -L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
- +L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
-  L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
-  L<EVP_SealInit(3)|EVP_SealInit(3)>
- diff -Naur openssl-0.9.8a.orig/doc/crypto/EVP_SealInit.pod openssl-0.9.8a/doc/crypto/EVP_SealInit.pod
- --- openssl-0.9.8a.orig/doc/crypto/EVP_SealInit.pod	2005-03-29 17:50:08.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/EVP_SealInit.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -74,7 +74,7 @@
-  =head1 SEE ALSO
- -L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
- +L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
-  L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
-  L<EVP_OpenInit(3)|EVP_OpenInit(3)>
- diff -Naur openssl-0.9.8a.orig/doc/crypto/EVP_SignInit.pod openssl-0.9.8a/doc/crypto/EVP_SignInit.pod
- --- openssl-0.9.8a.orig/doc/crypto/EVP_SignInit.pod	2005-03-22 17:55:33.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/EVP_SignInit.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -80,7 +80,7 @@
-  =head1 SEE ALSO
-  L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>,
- -L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
- +L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
-  L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
-  L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
-  L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
- diff -Naur openssl-0.9.8a.orig/doc/crypto/EVP_VerifyInit.pod openssl-0.9.8a/doc/crypto/EVP_VerifyInit.pod
- --- openssl-0.9.8a.orig/doc/crypto/EVP_VerifyInit.pod	2002-07-10 19:35:46.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/EVP_VerifyInit.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -71,7 +71,7 @@
-  L<evp(3)|evp(3)>,
-  L<EVP_SignInit(3)|EVP_SignInit(3)>,
- -L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
- +L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
-  L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
-  L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
-  L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
- diff -Naur openssl-0.9.8a.orig/doc/crypto/OPENSSL_config.pod openssl-0.9.8a/doc/crypto/OPENSSL_config.pod
- --- openssl-0.9.8a.orig/doc/crypto/OPENSSL_config.pod	2005-06-02 23:17:38.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/OPENSSL_config.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -73,7 +73,7 @@
   =head1 SEE ALSO
-  L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>,
+ -L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
- -L<CONF_modules_free(3),CONF_modules_free(3)>
+ +L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>
- +L<CONF_modules_free(3)|CONF_modules_free(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RAND_add.pod openssl-0.9.8a/doc/crypto/RAND_add.pod
+ --- doc/crypto/ERR_load_crypto_strings.pod	2000-02-24 12:55:08.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/RAND_add.pod	2000-03-22 15:30:03.000000000 +0000
+ +++ doc/crypto/ERR_load_crypto_strings.pod	2010-04-01 00:45:00.873827919 +0200
- +++ openssl-0.9.8a/doc/crypto/RAND_add.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -65,7 +65,7 @@
-  =head1 SEE ALSO
- -L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
- +L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
-  L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RAND_bytes.pod openssl-0.9.8a/doc/crypto/RAND_bytes.pod
- --- openssl-0.9.8a.orig/doc/crypto/RAND_bytes.pod	2002-09-25 13:33:27.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RAND_bytes.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -35,7 +35,7 @@
   =head1 SEE ALSO
- -L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
+ -L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
- +L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
+ +L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>
-  L<RAND_add(3)|RAND_add(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RAND_cleanup.pod openssl-0.9.8a/doc/crypto/RAND_cleanup.pod
- --- openssl-0.9.8a.orig/doc/crypto/RAND_cleanup.pod	2000-01-27 01:25:06.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RAND_cleanup.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -20,7 +20,7 @@
-  =head1 SEE ALSO
- -L<rand(3)|rand(3)>
- +L<openssl_rand(3)|openssl_rand(3)>
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RAND_egd.pod openssl-0.9.8a/doc/crypto/RAND_egd.pod
+ --- doc/crypto/ERR_load_strings.pod	2000-02-24 12:55:08.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/RAND_egd.pod	2001-02-10 19:10:36.000000000 +0000
+ +++ doc/crypto/ERR_load_strings.pod	2010-04-01 00:45:00.876327759 +0200
- +++ openssl-0.9.8a/doc/crypto/RAND_egd.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -69,7 +69,7 @@
-  =head1 SEE ALSO
- -L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>,
- +L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
-  L<RAND_cleanup(3)|RAND_cleanup(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RAND_load_file.pod openssl-0.9.8a/doc/crypto/RAND_load_file.pod
- --- openssl-0.9.8a.orig/doc/crypto/RAND_load_file.pod	2001-03-21 15:25:56.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RAND_load_file.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -43,7 +43,7 @@
   =head1 SEE ALSO
- -L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
+ -L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
- +L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
+ +L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RAND_set_rand_method.pod openssl-0.9.8a/doc/crypto/RAND_set_rand_method.pod
- --- openssl-0.9.8a.orig/doc/crypto/RAND_set_rand_method.pod	2002-08-05 16:27:01.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RAND_set_rand_method.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -67,7 +67,7 @@
-  =head1 SEE ALSO
- -L<rand(3)|rand(3)>, L<engine(3)|engine(3)>
- +L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RSA_blinding_on.pod openssl-0.9.8a/doc/crypto/RSA_blinding_on.pod
- --- openssl-0.9.8a.orig/doc/crypto/RSA_blinding_on.pod	2000-02-24 11:55:10.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RSA_blinding_on.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -34,7 +34,7 @@
-  =head1 SEE ALSO
- -L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)>
- +L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RSA_generate_key.pod openssl-0.9.8a/doc/crypto/RSA_generate_key.pod
- --- openssl-0.9.8a.orig/doc/crypto/RSA_generate_key.pod	2002-09-25 13:33:27.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RSA_generate_key.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -59,7 +59,7 @@
-  =head1 SEE ALSO
- -L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
- +L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
-  L<RSA_free(3)|RSA_free(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RSA_public_encrypt.pod openssl-0.9.8a/doc/crypto/RSA_public_encrypt.pod
- --- openssl-0.9.8a.orig/doc/crypto/RSA_public_encrypt.pod	2004-03-23 21:01:34.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RSA_public_encrypt.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -73,7 +73,7 @@
-  =head1 SEE ALSO
- -L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
- +L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
-  L<RSA_size(3)|RSA_size(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-0.9.8a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
- --- openssl-0.9.8a.orig/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod	2002-09-25 13:33:28.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -48,7 +48,7 @@
-  =head1 SEE ALSO
-  L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>,
- -L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
- +L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
-  L<RSA_verify(3)|RSA_verify(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-0.9.8a/doc/crypto/X509_NAME_ENTRY_get_object.pod
- --- openssl-0.9.8a.orig/doc/crypto/X509_NAME_ENTRY_get_object.pod	2005-03-30 11:50:14.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/X509_NAME_ENTRY_get_object.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -63,7 +63,7 @@
-  =head1 SEE ALSO
-  L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>,
- -L<OBJ_nid2obj(3),OBJ_nid2obj(3)>
- +L<OBJ_nid2obj(3)|OBJ_nid2obj(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/bn.pod openssl-0.9.8a/doc/crypto/bn.pod
- --- openssl-0.9.8a.orig/doc/crypto/bn.pod	2005-04-29 15:07:34.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/bn.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -167,7 +167,7 @@
-  =head1 SEE ALSO
-  L<bn_internal(3)|bn_internal(3)>,
- -L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
- +L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
-  L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>,
-  L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>,
-  L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>,
- diff -Naur openssl-0.9.8a.orig/doc/crypto/crypto.pod openssl-0.9.8a/doc/crypto/crypto.pod
- --- openssl-0.9.8a.orig/doc/crypto/crypto.pod	2002-10-06 12:59:25.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/crypto.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -46,7 +46,7 @@
-  =item AUXILIARY FUNCTIONS
- -L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>,
- +L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>,
-  L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)>
-  =item INPUT/OUTPUT, DATA ENCODING
- diff -Naur openssl-0.9.8a.orig/doc/crypto/des.pod openssl-0.9.8a/doc/crypto/des.pod
- --- openssl-0.9.8a.orig/doc/crypto/des.pod	2003-10-01 15:02:45.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/des.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -115,7 +115,7 @@
-  the key; it is used to speed the encryption process.
-  DES_random_key() generates a random key.  The PRNG must be seeded
- -prior to using this function (see L<rand(3)|rand(3)>).  If the PRNG
- +prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>).  If the PRNG
-  could not generate a secure key, 0 is returned.
-  Before a DES key can be used, it must be converted into the
- @@ -317,7 +317,7 @@
-  =head1 SEE ALSO
- -crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)>
- +crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>
-  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/dh.pod openssl-0.9.8a/doc/crypto/dh.pod
- --- openssl-0.9.8a.orig/doc/crypto/dh.pod	2002-08-05 16:27:01.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/dh.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -67,8 +67,8 @@
-  =head1 SEE ALSO
- -L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>,
- -L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
- +L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>,
- +L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>,
-  L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>,
-  L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>,
-  L<DH_generate_parameters(3)|DH_generate_parameters(3)>,
- diff -Naur openssl-0.9.8a.orig/doc/crypto/dsa.pod openssl-0.9.8a/doc/crypto/dsa.pod
- --- openssl-0.9.8a.orig/doc/crypto/dsa.pod	2002-08-05 16:27:01.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/dsa.pod	2005-11-14 03:59:59.000000000 +0000
- @@ -100,7 +100,7 @@
-  =head1 SEE ALSO
- -L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>,
- +L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>,
-  L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>,
-  L<DSA_new(3)|DSA_new(3)>,
-  L<DSA_size(3)|DSA_size(3)>,
- diff -Naur openssl-0.9.8a.orig/doc/crypto/engine.pod openssl-0.9.8a/doc/crypto/engine.pod
- --- openssl-0.9.8a.orig/doc/crypto/engine.pod	2004-06-17 23:40:14.000000000 +0000
- +++ openssl-0.9.8a/doc/crypto/engine.pod	2005-11-14 04:01:19.000000000 +0000
- @@ -594,6 +594,6 @@
-  =head1 SEE ALSO
- -L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)>
- +L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)>
-  =cut
+  =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/crypto/err.pod openssl-0.9.8a/doc/crypto/err.pod
- --- openssl-0.9.8a.orig/doc/crypto/err.pod	2002-07-10 19:35:46.000000000 +0000
+ --- doc/crypto/err.pod	2002-07-10 21:35:46.000000000 +0200
- +++ openssl-0.9.8a/doc/crypto/err.pod	1970-01-01 00:00:00.000000000 +0000
+ +++ doc/crypto/err.pod	1970-01-01 01:00:00.000000000 +0100
  @@ -1,187 +0,0 @@
  -=pod
  -
-Line 944 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 650 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  -L<SSL_get_error(3)|SSL_get_error(3)>
  -
  -=cut
- diff -Naur openssl-0.9.8a.orig/doc/crypto/openssl_err.pod openssl-0.9.8a/doc/crypto/openssl_err.pod
+ --- doc/crypto/ERR_print_errors.pod	2000-02-01 02:36:59.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/openssl_err.pod	1970-01-01 00:00:00.000000000 +0000
+ +++ doc/crypto/ERR_print_errors.pod	2010-04-01 00:45:00.879660945 +0200
- +++ openssl-0.9.8a/doc/crypto/openssl_err.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -38,7 +38,7 @@
+  =head1 SEE ALSO
+ -L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
+ +L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>,
+  L<ERR_get_error(3)|ERR_get_error(3)>,
+  L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>,
+  L<SSL_load_error_strings(3)|SSL_load_error_strings(3)>
+ --- doc/crypto/ERR_put_error.pod	2000-02-24 12:55:08.000000000 +0100
+ +++ doc/crypto/ERR_put_error.pod	2010-04-01 00:45:00.886327158 +0200
+ @@ -34,7 +34,7 @@
+  =head1 SEE ALSO
+ -L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
+ +L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)>
+  =head1 HISTORY
+ --- doc/crypto/ERR_remove_state.pod	2000-05-19 09:54:42.000000000 +0200
+ +++ doc/crypto/ERR_remove_state.pod	2010-04-01 00:45:00.892994288 +0200
+ @@ -25,7 +25,7 @@
+  =head1 SEE ALSO
+ -L<err(3)|err(3)>
+ +L<openssl_err(3)|openssl_err(3)>
+  =head1 HISTORY
+ --- doc/crypto/EVP_BytesToKey.pod	2004-11-25 18:47:30.000000000 +0100
+ +++ doc/crypto/EVP_BytesToKey.pod	2010-04-01 00:45:00.899660540 +0200
+ @@ -59,7 +59,7 @@
+  =head1 SEE ALSO
+ -L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
+ +L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
+  L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>
+  =head1 HISTORY
+ --- doc/crypto/EVP_OpenInit.pod	2000-09-23 09:16:14.000000000 +0200
+ +++ doc/crypto/EVP_OpenInit.pod	2010-04-01 00:45:00.906327633 +0200
+ @@ -54,7 +54,7 @@
+  =head1 SEE ALSO
+ -L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
+ +L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
+  L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
+  L<EVP_SealInit(3)|EVP_SealInit(3)>
+ --- doc/crypto/EVP_SealInit.pod	2005-03-29 19:50:08.000000000 +0200
+ +++ doc/crypto/EVP_SealInit.pod	2010-04-01 00:45:00.912995642 +0200
+ @@ -74,7 +74,7 @@
+  =head1 SEE ALSO
+ -L<evp(3)|evp(3)>, L<rand(3)|rand(3)>,
+ +L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>,
+  L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>,
+  L<EVP_OpenInit(3)|EVP_OpenInit(3)>
+ --- doc/crypto/EVP_SignInit.pod	2006-07-12 14:31:29.000000000 +0200
+ +++ doc/crypto/EVP_SignInit.pod	2010-04-01 00:45:00.919661935 +0200
+ @@ -89,7 +89,7 @@
+  =head1 SEE ALSO
+  L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>,
+ -L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
+ +L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
+  L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
+  L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
+  L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
+ --- doc/crypto/EVP_VerifyInit.pod	2006-07-12 14:31:30.000000000 +0200
+ +++ doc/crypto/EVP_VerifyInit.pod	2010-04-01 00:45:00.926327388 +0200
+ @@ -80,7 +80,7 @@
+  L<evp(3)|evp(3)>,
+  L<EVP_SignInit(3)|EVP_SignInit(3)>,
+ -L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>,
+ +L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>,
+  L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>,
+  L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>,
+  L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)>
+ --- doc/crypto/OPENSSL_config.pod	2005-06-03 01:19:56.000000000 +0200
+ +++ doc/crypto/OPENSSL_config.pod	2010-04-01 00:45:00.932995118 +0200
+ @@ -73,7 +73,7 @@
+  =head1 SEE ALSO
+  L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>,
+ -L<CONF_modules_free(3),CONF_modules_free(3)>
+ +L<CONF_modules_free(3)|CONF_modules_free(3)>
+  =head1 HISTORY
+ --- doc/crypto/openssl_err.pod	1970-01-01 01:00:00.000000000 +0100
+ +++ doc/crypto/openssl_err.pod	2010-04-01 00:45:01.059660101 +0200
  @@ -0,0 +1,187 @@
  +=pod
  +
-Line 1135 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 939 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  +L<SSL_get_error(3)|SSL_get_error(3)>
  +
  +=cut
- diff -Naur openssl-0.9.8a.orig/doc/crypto/openssl_rand.pod openssl-0.9.8a/doc/crypto/openssl_rand.pod
+ --- doc/crypto/openssl_rand.pod	1970-01-01 01:00:00.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/openssl_rand.pod	1970-01-01 00:00:00.000000000 +0000
+ +++ doc/crypto/openssl_rand.pod	2010-04-01 00:45:01.059660101 +0200
- +++ openssl-0.9.8a/doc/crypto/openssl_rand.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -0,0 +1,175 @@
  +=pod
  +
-Line 1314 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1117 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  +L<RAND_cleanup(3)|RAND_cleanup(3)>
  +
  +=cut
- diff -Naur openssl-0.9.8a.orig/doc/crypto/openssl_threads.pod openssl-0.9.8a/doc/crypto/openssl_threads.pod
+ --- doc/crypto/openssl_threads.pod	1970-01-01 01:00:00.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/openssl_threads.pod	1970-01-01 00:00:00.000000000 +0000
+ +++ doc/crypto/openssl_threads.pod	2009-10-01 01:40:52.000000000 +0200
- +++ openssl-0.9.8a/doc/crypto/openssl_threads.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -0,0 +1,210 @@
- @@ -0,0 +1,175 @@
  +=pod
  +
  +=head1 NAME
  +
- +CRYPTO_set_locking_callback, CRYPTO_set_id_callback, CRYPTO_num_locks,
+ +CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback,
+ +CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy,
+ +CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks,
  +CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
  +CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
  +CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
-Line 1331 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1135 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  +
  + #include <openssl/crypto.h>
  +
- + void CRYPTO_set_locking_callback(void (*locking_function)(int mode,
+ + /* Don't use this structure directly. */
- +        int n, const char *file, int line));
+ + typedef struct crypto_threadid_st
- +
+ +         {
- + void CRYPTO_set_id_callback(unsigned long (*id_function)(void));
+ +         void *ptr;
+ +         unsigned long val;
+ +         } CRYPTO_THREADID;
+ + /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
+ + void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
+ + void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
+ + int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
+ + void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
+ + void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
+ + int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a,
+ +                         const CRYPTO_THREADID *b);
+ + void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest,
+ +                          const CRYPTO_THREADID *src);
+ + unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
  +
  + int CRYPTO_num_locks(void);
  +
- +
  + /* struct CRYPTO_dynlock_value needs to be defined by the user */
  + struct CRYPTO_dynlock_value;
  +
-Line 1370 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1186 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  +=head1 DESCRIPTION
  +
  +OpenSSL can safely be used in multi-threaded applications provided
- +that at least two callback functions are set.
+ +that at least two callback functions are set, locking_function and
+ +threadid_func.
  +
  +locking_function(int mode, int n, const char *file, int line) is
  +needed to perform locking on shared data structures.
-Line 1385 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1202 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  +B<file> and B<line> are the file number of the function setting the
  +lock. They can be useful for debugging.
  +
- +id_function(void) is a function that returns a thread ID, for example
+ +threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing
- +pthread_self() if it returns an integer (see NOTES below).  It isn't
+ +thread's identifier into B<id>. The implementation of this callback should not
- +needed on Windows nor on platforms where getpid() returns a different
+ +fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread
- +ID for each thread (see NOTES below).
+ +IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based.
+ +If the application does not register such a callback using
+ +CRYPTO_THREADID_set_callback(), then a default implementation is used - on
+ +Windows and BeOS this uses the system's default thread identifying APIs, and on
+ +all other platforms it uses the address of B<errno>. The latter is satisfactory
+ +for thread-safety if and only if the platform has a thread-local error number
+ +facility.
+ +
+ +Once threadid_func() is registered, or if the built-in default implementation is
+ +to be used;
+ +
+ +=over 4
+ +
+ +=item *
+ +CRYPTO_THREADID_current() records the currently-executing thread ID into the
+ +given B<id> object.
+ +
+ +=item *
+ +CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie.
+ +the same semantics as memcmp()).
+ +
+ +=item *
+ +CRYPTO_THREADID_cpy() duplicates a thread ID value,
+ +
+ +=item *
+ +CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This
+ +is usually the exact numeric or pointer-based thread ID used internally, however
+ +this also handles the unusual case where pointers are larger than 'long'
+ +variables and the platform's thread IDs are pointer-based - in this case, mixing
+ +is done to attempt to produce a unique numeric value even though it is not as
+ +wide as the platform's true thread IDs.
+ +
+ +=back
  +
  +Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
  +of OpenSSL need it for better performance.  To enable this, the following
-Line 1460 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1309 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  +Also, dynamic locks are currently not used internally by OpenSSL, but
  +may do so in the future.
  +
- +Defining id_function(void) has it's own issues.  Generally speaking,
- +pthread_self() should be used, even on platforms where getpid() gives
- +different answers in each thread, since that may depend on the machine
- +the program is run on, not the machine where the program is being
- +compiled.  For instance, Red Hat 8 Linux and earlier used
- +LinuxThreads, whose getpid() returns a different value for each
- +thread.  Red Hat 9 Linux and later use NPTL, which is
- +Posix-conformant, and has a getpid() that returns the same value for
- +all threads in a process.  A program compiled on Red Hat 8 and run on
- +Red Hat 9 will therefore see getpid() returning the same value for
- +all threads.
- +
- +There is still the issue of platforms where pthread_self() returns
- +something other than an integer.  This is a bit unusual, and this
- +manual has no cookbook solution for that case.
- +
  +=head1 EXAMPLES
  +
  +B<crypto/threads/mttest.c> shows examples of the callback functions on
-Line 1483 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1316 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  +
  +=head1 HISTORY
  +
- +CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are
+ +CRYPTO_set_locking_callback() is
  +available in all versions of SSLeay and OpenSSL.
  +CRYPTO_num_locks() was added in OpenSSL 0.9.4.
  +All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
+ +B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0
+ +to replace (actually, deprecate) the previous CRYPTO_set_id_callback(),
+ +CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed
+ +thread IDs to always be represented by 'unsigned long'.
  +
  +=head1 SEE ALSO
  +
  +L<crypto(3)|crypto(3)>
  +
  +=cut
- diff -Naur openssl-0.9.8a.orig/doc/crypto/rand.pod openssl-0.9.8a/doc/crypto/rand.pod
+ --- doc/crypto/RAND_add.pod	2000-03-22 16:30:03.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/rand.pod	2002-08-05 16:27:01.000000000 +0000
+ +++ doc/crypto/RAND_add.pod	2010-04-01 00:45:00.939660251 +0200
- +++ openssl-0.9.8a/doc/crypto/rand.pod	1970-01-01 00:00:00.000000000 +0000
+ @@ -65,7 +65,7 @@
+  =head1 SEE ALSO
+ -L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
+ +L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>,
+  L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
+  =head1 HISTORY
+ --- doc/crypto/RAND_bytes.pod	2007-09-24 13:01:18.000000000 +0200
+ +++ doc/crypto/RAND_bytes.pod	2010-04-01 00:45:00.946326823 +0200
+ @@ -38,7 +38,7 @@
+  =head1 SEE ALSO
+ -L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
+ +L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>,
+  L<RAND_add(3)|RAND_add(3)>
+  =head1 HISTORY
+ --- doc/crypto/RAND_cleanup.pod	2000-01-27 02:25:06.000000000 +0100
+ +++ doc/crypto/RAND_cleanup.pod	2010-04-01 00:45:00.952993593 +0200
+ @@ -20,7 +20,7 @@
+  =head1 SEE ALSO
+ -L<rand(3)|rand(3)>
+ +L<openssl_rand(3)|openssl_rand(3)>
+  =head1 HISTORY
+ --- doc/crypto/RAND_egd.pod	2008-11-10 12:26:44.000000000 +0100
+ +++ doc/crypto/RAND_egd.pod	2010-04-01 00:45:00.959660646 +0200
+ @@ -72,7 +72,7 @@
+  =head1 SEE ALSO
+ -L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>,
+ +L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>,
+  L<RAND_cleanup(3)|RAND_cleanup(3)>
+  =head1 HISTORY
+ --- doc/crypto/RAND_load_file.pod	2001-03-21 16:25:56.000000000 +0100
+ +++ doc/crypto/RAND_load_file.pod	2010-04-01 00:45:00.976327494 +0200
+ @@ -43,7 +43,7 @@
+  =head1 SEE ALSO
+ -L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
+ +L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)>
+  =head1 HISTORY
+ --- doc/crypto/rand.pod	2002-08-05 18:27:01.000000000 +0200
+ +++ doc/crypto/rand.pod	1970-01-01 01:00:00.000000000 +0100
  @@ -1,175 +0,0 @@
  -=pod
  -
-Line 1672 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1563 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
  -L<RAND_cleanup(3)|RAND_cleanup(3)>
  -
  -=cut
- diff -Naur openssl-0.9.8a.orig/doc/crypto/rsa.pod openssl-0.9.8a/doc/crypto/rsa.pod
+ --- doc/crypto/RAND_set_rand_method.pod	2007-11-19 10:18:03.000000000 +0100
- --- openssl-0.9.8a.orig/doc/crypto/rsa.pod	2002-08-04 21:08:36.000000000 +0000
+ +++ doc/crypto/RAND_set_rand_method.pod	2010-04-01 00:45:00.982994946 +0200
- +++ openssl-0.9.8a/doc/crypto/rsa.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -67,7 +67,7 @@
+  =head1 SEE ALSO
+ -L<rand(3)|rand(3)>, L<engine(3)|engine(3)>
+ +L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>
+  =head1 HISTORY
+ --- doc/crypto/RSA_blinding_on.pod	2000-02-24 12:55:10.000000000 +0100
+ +++ doc/crypto/RSA_blinding_on.pod	2010-04-01 00:45:00.989661318 +0200
+ @@ -34,7 +34,7 @@
+  =head1 SEE ALSO
+ -L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)>
+ +L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)>
+  =head1 HISTORY
+ --- doc/crypto/RSA_generate_key.pod	2002-09-25 15:33:27.000000000 +0200
+ +++ doc/crypto/RSA_generate_key.pod	2010-04-01 00:45:00.996327969 +0200
+ @@ -59,7 +59,7 @@
+  =head1 SEE ALSO
+ -L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
+ +L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
+  L<RSA_free(3)|RSA_free(3)>
+  =head1 HISTORY
+ --- doc/crypto/rsa.pod	2002-08-04 23:08:36.000000000 +0200
+ +++ doc/crypto/rsa.pod	2010-04-01 00:45:01.062995006 +0200
  @@ -108,7 +108,7 @@
   =head1 SEE ALSO
-Line 1684 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
+Line 1607 
 diff -Naur openssl-0.9.8a.orig/doc/crypt
   L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>,
   L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>,
   L<RSA_generate_key(3)|RSA_generate_key(3)>,
- diff -Naur openssl-0.9.8a.orig/doc/ssl/SSL_get_error.pod openssl-0.9.8a/doc/ssl/SSL_get_error.pod
+ --- doc/crypto/RSA_public_encrypt.pod	2004-03-23 22:01:34.000000000 +0100
- --- openssl-0.9.8a.orig/doc/ssl/SSL_get_error.pod	2005-03-30 11:50:14.000000000 +0000
+ +++ doc/crypto/RSA_public_encrypt.pod	2010-04-01 00:45:01.002994781 +0200
- +++ openssl-0.9.8a/doc/ssl/SSL_get_error.pod	2005-11-14 03:59:59.000000000 +0000
+ @@ -73,7 +73,7 @@
+  =head1 SEE ALSO
+ -L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>,
+ +L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>,
+  L<RSA_size(3)|RSA_size(3)>
+  =head1 HISTORY
+ --- doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod	2002-09-25 15:33:28.000000000 +0200
+ +++ doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod	2010-04-01 00:45:01.009660553 +0200
+ @@ -48,7 +48,7 @@
+  =head1 SEE ALSO
+  L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>,
+ -L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
+ +L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>,
+  L<RSA_verify(3)|RSA_verify(3)>
+  =head1 HISTORY
+ --- doc/crypto/threads.pod	2009-10-01 01:40:52.000000000 +0200
+ +++ doc/crypto/threads.pod	1970-01-01 01:00:00.000000000 +0100
+ @@ -1,210 +0,0 @@
+ -=pod
+ -
+ -=head1 NAME
+ -
+ -CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback,
+ -CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy,
+ -CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks,
+ -CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback,
+ -CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid,
+ -CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support
+ -
+ -=head1 SYNOPSIS
+ -
+ - #include <openssl/crypto.h>
+ -
+ - /* Don't use this structure directly. */
+ - typedef struct crypto_threadid_st
+ -         {
+ -         void *ptr;
+ -         unsigned long val;
+ -         } CRYPTO_THREADID;
+ - /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
+ - void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
+ - void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
+ - int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *));
+ - void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *);
+ - void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
+ - int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a,
+ -                         const CRYPTO_THREADID *b);
+ - void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest,
+ -                          const CRYPTO_THREADID *src);
+ - unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
+ -
+ - int CRYPTO_num_locks(void);
+ -
+ - /* struct CRYPTO_dynlock_value needs to be defined by the user */
+ - struct CRYPTO_dynlock_value;
+ -
+ - void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *
+ -	(*dyn_create_function)(char *file, int line));
+ - void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
+ -	(int mode, struct CRYPTO_dynlock_value *l,
+ -	const char *file, int line));
+ - void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
+ -	(struct CRYPTO_dynlock_value *l, const char *file, int line));
+ -
+ - int CRYPTO_get_new_dynlockid(void);
+ -
+ - void CRYPTO_destroy_dynlockid(int i);
+ -
+ - void CRYPTO_lock(int mode, int n, const char *file, int line);
+ -
+ - #define CRYPTO_w_lock(type)	\
+ -	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
+ - #define CRYPTO_w_unlock(type)	\
+ -	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
+ - #define CRYPTO_r_lock(type)	\
+ -	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
+ - #define CRYPTO_r_unlock(type)	\
+ -	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
+ - #define CRYPTO_add(addr,amount,type)	\
+ -	CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
+ -
+ -=head1 DESCRIPTION
+ -
+ -OpenSSL can safely be used in multi-threaded applications provided
+ -that at least two callback functions are set, locking_function and
+ -threadid_func.
+ -
+ -locking_function(int mode, int n, const char *file, int line) is
+ -needed to perform locking on shared data structures.
+ -(Note that OpenSSL uses a number of global data structures that
+ -will be implicitly shared whenever multiple threads use OpenSSL.)
+ -Multi-threaded applications will crash at random if it is not set.
+ -
+ -locking_function() must be able to handle up to CRYPTO_num_locks()
+ -different mutex locks. It sets the B<n>-th lock if B<mode> &
+ -B<CRYPTO_LOCK>, and releases it otherwise.
+ -
+ -B<file> and B<line> are the file number of the function setting the
+ -lock. They can be useful for debugging.
+ -
+ -threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing
+ -thread's identifier into B<id>. The implementation of this callback should not
+ -fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread
+ -IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based.
+ -If the application does not register such a callback using
+ -CRYPTO_THREADID_set_callback(), then a default implementation is used - on
+ -Windows and BeOS this uses the system's default thread identifying APIs, and on
+ -all other platforms it uses the address of B<errno>. The latter is satisfactory
+ -for thread-safety if and only if the platform has a thread-local error number
+ -facility.
+ -
+ -Once threadid_func() is registered, or if the built-in default implementation is
+ -to be used;
+ -
+ -=over 4
+ -
+ -=item *
+ -CRYPTO_THREADID_current() records the currently-executing thread ID into the
+ -given B<id> object.
+ -
+ -=item *
+ -CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie.
+ -the same semantics as memcmp()).
+ -
+ -=item *
+ -CRYPTO_THREADID_cpy() duplicates a thread ID value,
+ -
+ -=item *
+ -CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This
+ -is usually the exact numeric or pointer-based thread ID used internally, however
+ -this also handles the unusual case where pointers are larger than 'long'
+ -variables and the platform's thread IDs are pointer-based - in this case, mixing
+ -is done to attempt to produce a unique numeric value even though it is not as
+ -wide as the platform's true thread IDs.
+ -
+ -=back
+ -
+ -Additionally, OpenSSL supports dynamic locks, and sometimes, some parts
+ -of OpenSSL need it for better performance.  To enable this, the following
+ -is required:
+ -
+ -=over 4
+ -
+ -=item *
+ -Three additional callback function, dyn_create_function, dyn_lock_function
+ -and dyn_destroy_function.
+ -
+ -=item *
+ -A structure defined with the data that each lock needs to handle.
+ -
+ -=back
+ -
+ -struct CRYPTO_dynlock_value has to be defined to contain whatever structure
+ -is needed to handle locks.
+ -
+ -dyn_create_function(const char *file, int line) is needed to create a
+ -lock.  Multi-threaded applications might crash at random if it is not set.
+ -
+ -dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line)
+ -is needed to perform locking off dynamic lock numbered n. Multi-threaded
+ -applications might crash at random if it is not set.
+ -
+ -dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is
+ -needed to destroy the lock l. Multi-threaded applications might crash at
+ -random if it is not set.
+ -
+ -CRYPTO_get_new_dynlockid() is used to create locks.  It will call
+ -dyn_create_function for the actual creation.
+ -
+ -CRYPTO_destroy_dynlockid() is used to destroy locks.  It will call
+ -dyn_destroy_function for the actual destruction.
+ -
+ -CRYPTO_lock() is used to lock and unlock the locks.  mode is a bitfield
+ -describing what should be done with the lock.  n is the number of the
+ -lock as returned from CRYPTO_get_new_dynlockid().  mode can be combined
+ -from the following values.  These values are pairwise exclusive, with
+ -undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE
+ -should not be used together):
+ -
+ -	CRYPTO_LOCK	0x01
+ -	CRYPTO_UNLOCK	0x02
+ -	CRYPTO_READ	0x04
+ -	CRYPTO_WRITE	0x08
+ -
+ -=head1 RETURN VALUES
+ -
+ -CRYPTO_num_locks() returns the required number of locks.
+ -
+ -CRYPTO_get_new_dynlockid() returns the index to the newly created lock.
+ -
+ -The other functions return no values.
+ -
+ -=head1 NOTES
+ -
+ -You can find out if OpenSSL was configured with thread support:
+ -
+ - #define OPENSSL_THREAD_DEFINES
+ - #include <openssl/opensslconf.h>
+ - #if defined(OPENSSL_THREADS)
+ -   // thread support enabled
+ - #else
+ -   // no thread support
+ - #endif
+ -
+ -Also, dynamic locks are currently not used internally by OpenSSL, but
+ -may do so in the future.
+ -
+ -=head1 EXAMPLES
+ -
+ -B<crypto/threads/mttest.c> shows examples of the callback functions on
+ -Solaris, Irix and Win32.
+ -
+ -=head1 HISTORY
+ -
+ -CRYPTO_set_locking_callback() is
+ -available in all versions of SSLeay and OpenSSL.
+ -CRYPTO_num_locks() was added in OpenSSL 0.9.4.
+ -All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev.
+ -B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0
+ -to replace (actually, deprecate) the previous CRYPTO_set_id_callback(),
+ -CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed
+ -thread IDs to always be represented by 'unsigned long'.
+ -
+ -=head1 SEE ALSO
+ -
+ -L<crypto(3)|crypto(3)>
+ -
+ -=cut
+ --- doc/crypto/X509_NAME_ENTRY_get_object.pod	2006-05-14 13:27:59.000000000 +0200
+ +++ doc/crypto/X509_NAME_ENTRY_get_object.pod	2010-04-01 00:45:01.016327524 +0200
+ @@ -65,7 +65,7 @@
+  =head1 SEE ALSO
+  L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>,
+ -L<OBJ_nid2obj(3),OBJ_nid2obj(3)>
+ +L<OBJ_nid2obj(3)|OBJ_nid2obj(3)>
+  =head1 HISTORY
+ --- doc/ssl/SSL_get_error.pod	2005-03-30 13:50:14.000000000 +0200
+ +++ doc/ssl/SSL_get_error.pod	2010-04-01 00:45:03.069662282 +0200
  @@ -105,7 +105,7 @@
   =head1 SEE ALSO
-Line 1696 
 diff -Naur openssl-0.9.8a.orig/doc/ssl/S
+Line 1864 
 diff -Naur openssl-0.9.8a.orig/doc/ssl/S
   =head1 HISTORY
- diff -Naur openssl-0.9.8a.orig/doc/ssl/SSL_want.pod openssl-0.9.8a/doc/ssl/SSL_want.pod
+ --- doc/ssl/SSL_want.pod	2005-03-30 13:50:14.000000000 +0200
- --- openssl-0.9.8a.orig/doc/ssl/SSL_want.pod	2005-03-30 11:50:14.000000000 +0000
+ +++ doc/ssl/SSL_want.pod	2010-04-01 00:45:03.082993225 +0200
- +++ openssl-0.9.8a/doc/ssl/SSL_want.pod	2005-11-14 03:59:59.000000000 +0000
  @@ -72,6 +72,6 @@
   =head1 SEE ALSO
-Line 1707 
 diff -Naur openssl-0.9.8a.orig/doc/ssl/S
+Line 1874 
 diff -Naur openssl-0.9.8a.orig/doc/ssl/S
  +L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)>
   =cut
+ --- FAQ	2010-03-29 15:11:53.000000000 +0200
+ +++ FAQ	2010-04-01 00:46:00.593821225 +0200
+ @@ -724,7 +724,7 @@
+  CRYPTO_set_id_callback(), for all versions of OpenSSL up to and
+  including 0.9.8[abc...]. As of version 0.9.9, CRYPTO_set_id_callback()
+  and associated APIs are deprecated by CRYPTO_THREADID_set_callback()
+ -and friends. This is described in the threads(3) manpage.
+ +and friends. This is described in the openssl_threads(3) manpage.
+  * I've compiled a program under Windows and it crashes: why?

 Legend:



Removed from v.1084
 


changed lines


 
Added in v.1085
 Legend:



Removed from v.1084
 


changed lines


 
Added in v.1085
-Removed from v.1084
+Added in v.1085