From 91e7acec7805190f4080d6cab79ac824375755ce Mon Sep 17 00:00:00 2001 From: James Meyer Date: Tue, 7 Aug 2012 12:48:52 -0500 Subject: openssl 1.0.1c --- abs/core/openssl/PKGBUILD | 50 +++-- abs/core/openssl/fix-manpages.patch | 387 +++++++++++++++++++----------------- 2 files changed, 243 insertions(+), 194 deletions(-) diff --git a/abs/core/openssl/PKGBUILD b/abs/core/openssl/PKGBUILD index 9853a57..29fd885 100644 --- a/abs/core/openssl/PKGBUILD +++ b/abs/core/openssl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 81714 2010-06-02 11:00:36Z pierre $ +# $Id: PKGBUILD 158833 2012-05-11 23:33:03Z pierre $ # Maintainer: Pierre Schmitz pkgname=openssl -_ver=1.0.0a +_ver=1.0.1c # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=2 +#pkgver=$_ver +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64') url='https://www.openssl.org' @@ -15,38 +16,53 @@ optdepends=('ca-certificates') options=('!makeflags') backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" + "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'fix-manpages.patch' 'no-rpath.patch' 'ca-dir.patch') -md5sums=('e3873edfffc783624cfbdb65e2249cbd' - 'f540cd9e0e3047d589d0581fe7a2d0f2' +md5sums=('ae412727c8c15b67880aef7bd2999b2e' + 'a3d90bc42253def61cd1c4237f1ce5f7' + '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - build() { cd $srcdir/$pkgname-$_ver + if [ "${CARCH}" == 'x86_64' ]; then + openssltarget='linux-x86_64' + optflags='enable-ec_nistp_64_gcc_128' + elif [ "${CARCH}" == 'i686' ]; then + openssltarget='linux-elf' + optflags='' + fi + # avoid conflicts with other man pages # see http://www.linuxfromscratch.org/patches/downloads/openssl/ - patch -p0 -i $srcdir/fix-manpages.patch || return 1 + patch -p1 -i $srcdir/fix-manpages.patch # remove rpath: http://bugs.archlinux.org/task/14367 - patch -p0 -i $srcdir/no-rpath.patch || return 1 + patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default - patch -p0 -i $srcdir/ca-dir.patch || return 1 + patch -p0 -i $srcdir/ca-dir.patch # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 -Wa,--noexecstack || return 1 + # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ + shared zlib enable-md2 ${optflags} \ + "${openssltarget}" \ + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ + -DOPENSSL_NO_TLS1_2_CLIENT - make || return 1 + make depend + make +} +check() { + cd $srcdir/$pkgname-$_ver # the test fails due to missing write permissions in /etc/ssl # revert this patch for make test - #patch -p0 -R -i $srcdir/ca-dir.patch - #make test || return 1 - #patch -p0 -i $srcdir/ca-dir.patch + patch -p0 -R -i $srcdir/ca-dir.patch + make test + patch -p0 -i $srcdir/ca-dir.patch } package() { diff --git a/abs/core/openssl/fix-manpages.patch b/abs/core/openssl/fix-manpages.patch index e043081..0a300f3 100644 --- a/abs/core/openssl/fix-manpages.patch +++ b/abs/core/openssl/fix-manpages.patch @@ -1,5 +1,18 @@ ---- crypto/rand/md_rand.c 2009-01-03 10:25:32.000000000 +0100 -+++ crypto/rand/md_rand.c 2010-04-01 00:45:00.746327192 +0200 +Submitted By: Robert Connolly +Date: 2005-11-13 +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. Rediffed for 1.0.0a by Ken Moffat + +diff -Naur openssl-1.0.0a.orig//crypto/rand/md_rand.c openssl-1.0.0a/crypto/rand/md_rand.c +--- openssl-1.0.0a.orig//crypto/rand/md_rand.c 2009-01-03 09:25:32.000000000 +0000 ++++ openssl-1.0.0a/crypto/rand/md_rand.c 2010-09-01 19:36:31.604126440 +0100 @@ -196,7 +196,7 @@ int do_not_lock; @@ -18,8 +31,9 @@ * * For each group of 10 bytes (or less), we do the following: * ---- doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100 -+++ doc/apps/openssl-passwd.pod 2010-04-01 00:45:00.796327220 +0200 +diff -Naur openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod openssl-1.0.0a/doc/apps/openssl-passwd.pod +--- openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/apps/openssl-passwd.pod 2010-09-01 19:36:31.608126088 +0100 @@ -0,0 +1,82 @@ +=pod + @@ -103,8 +117,9 @@ +B prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. + +=cut ---- doc/apps/openssl.pod 2010-01-21 19:46:28.000000000 +0100 -+++ doc/apps/openssl.pod 2010-04-01 00:45:00.796327220 +0200 +diff -Naur openssl-1.0.0a.orig//doc/apps/openssl.pod openssl-1.0.0a/doc/apps/openssl.pod +--- openssl-1.0.0a.orig//doc/apps/openssl.pod 2010-01-21 18:46:28.000000000 +0000 ++++ openssl-1.0.0a/doc/apps/openssl.pod 2010-09-01 19:36:31.608126088 +0100 @@ -163,7 +163,7 @@ Online Certificate Status Protocol utility. @@ -123,8 +138,9 @@ L, L, L, L, L, L, L, L, ---- doc/apps/passwd.pod 2002-10-04 14:59:00.000000000 +0200 -+++ doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100 +diff -Naur openssl-1.0.0a.orig//doc/apps/passwd.pod openssl-1.0.0a/doc/apps/passwd.pod +--- openssl-1.0.0a.orig//doc/apps/passwd.pod 2002-10-04 13:59:00.000000000 +0100 ++++ openssl-1.0.0a/doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -=pod - @@ -208,8 +224,9 @@ -B prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. - -=cut ---- doc/crypto/BN_generate_prime.pod 2003-01-13 14:18:22.000000000 +0100 -+++ doc/crypto/BN_generate_prime.pod 2010-04-01 00:45:00.824035190 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod openssl-1.0.0a/doc/crypto/BN_generate_prime.pod +--- openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod 2003-01-13 13:18:22.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/BN_generate_prime.pod 2010-09-01 19:36:31.608126088 +0100 @@ -90,7 +90,7 @@ =head1 SEE ALSO @@ -219,8 +236,9 @@ =head1 HISTORY ---- doc/crypto/bn.pod 2008-07-03 21:59:24.000000000 +0200 -+++ doc/crypto/bn.pod 2010-04-01 00:45:01.022993777 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/bn.pod openssl-1.0.0a/doc/crypto/bn.pod +--- openssl-1.0.0a.orig//doc/crypto/bn.pod 2008-07-03 20:59:24.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/bn.pod 2010-09-01 19:36:31.620125025 +0100 @@ -167,7 +167,7 @@ =head1 SEE ALSO @@ -230,8 +248,9 @@ L, L, L, L, L, L, L, ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_rand.pod openssl-1.0.0a/doc/crypto/BN_rand.pod +--- openssl-1.0.0a.orig//doc/crypto/BN_rand.pod 2002-09-25 14:33:26.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/BN_rand.pod 2010-09-01 19:36:31.608126088 +0100 @@ -45,7 +45,7 @@ =head1 SEE ALSO @@ -241,8 +260,9 @@ L, L =head1 HISTORY ---- doc/crypto/CONF_modules_free.pod 2006-12-21 22:13:27.000000000 +0100 -+++ doc/crypto/CONF_modules_free.pod 2010-04-01 00:45:00.827162198 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod openssl-1.0.0a/doc/crypto/CONF_modules_free.pod +--- openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod 2006-12-21 21:13:27.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/CONF_modules_free.pod 2010-09-01 19:36:31.608126088 +0100 @@ -37,7 +37,7 @@ =head1 SEE ALSO @@ -252,8 +272,9 @@ =head1 HISTORY ---- doc/crypto/CONF_modules_load_file.pod 2004-03-02 14:31:32.000000000 +0100 -+++ doc/crypto/CONF_modules_load_file.pod 2010-04-01 00:45:00.833827289 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod +--- openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod 2004-03-02 13:31:32.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod 2010-09-01 19:36:31.608126088 +0100 @@ -51,7 +51,7 @@ =head1 SEE ALSO @@ -263,8 +284,9 @@ =head1 HISTORY ---- doc/crypto/crypto.pod 2002-10-06 14:59:25.000000000 +0200 -+++ doc/crypto/crypto.pod 2010-04-01 00:45:01.029660428 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/crypto.pod openssl-1.0.0a/doc/crypto/crypto.pod +--- openssl-1.0.0a.orig//doc/crypto/crypto.pod 2002-10-06 13:59:25.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/crypto.pod 2010-09-01 19:36:31.620125025 +0100 @@ -46,7 +46,7 @@ =item AUXILIARY FUNCTIONS @@ -274,8 +296,9 @@ L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/des.pod openssl-1.0.0a/doc/crypto/des.pod +--- openssl-1.0.0a.orig//doc/crypto/des.pod 2003-10-01 16:02:45.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/des.pod 2010-09-01 19:36:31.620125025 +0100 @@ -115,7 +115,7 @@ the key; it is used to speed the encryption process. @@ -294,8 +317,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod openssl-1.0.0a/doc/crypto/DH_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DH_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 @@ -40,7 +40,7 @@ =head1 SEE ALSO @@ -305,8 +329,9 @@ =head1 HISTORY ---- doc/crypto/DH_generate_parameters.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DH_generate_parameters.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod +--- openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 @@ -59,7 +59,7 @@ =head1 SEE ALSO @@ -316,8 +341,9 @@ L =head1 HISTORY ---- doc/crypto/dh.pod 2002-08-05 18:27:01.000000000 +0200 -+++ doc/crypto/dh.pod 2010-04-01 00:45:01.036327160 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/dh.pod openssl-1.0.0a/doc/crypto/dh.pod +--- openssl-1.0.0a.orig//doc/crypto/dh.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/dh.pod 2010-09-01 19:36:31.620125025 +0100 @@ -67,8 +67,8 @@ =head1 SEE ALSO @@ -329,8 +355,9 @@ L, L, L, L, ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod openssl-1.0.0a/doc/crypto/DSA_do_sign.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_do_sign.pod 2010-09-01 19:36:31.608126088 +0100 @@ -36,7 +36,7 @@ =head1 SEE ALSO @@ -340,8 +367,9 @@ L, L ---- doc/crypto/DSA_generate_key.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DSA_generate_key.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod openssl-1.0.0a/doc/crypto/DSA_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 @@ -24,7 +24,7 @@ =head1 SEE ALSO @@ -351,8 +379,9 @@ L =head1 HISTORY ---- doc/crypto/DSA_generate_parameters.pod 2002-09-25 15:33:27.000000000 +0200 -+++ doc/crypto/DSA_generate_parameters.pod 2010-04-01 00:45:00.847161913 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 @@ -90,7 +90,7 @@ =head1 SEE ALSO @@ -362,8 +391,9 @@ L =head1 HISTORY ---- doc/crypto/dsa.pod 2002-08-05 18:27:01.000000000 +0200 -+++ doc/crypto/dsa.pod 2010-04-01 00:45:01.042994012 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/dsa.pod openssl-1.0.0a/doc/crypto/dsa.pod +--- openssl-1.0.0a.orig//doc/crypto/dsa.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/dsa.pod 2010-09-01 19:36:31.620125025 +0100 @@ -100,7 +100,7 @@ =head1 SEE ALSO @@ -373,8 +403,9 @@ L, L, L, L, L, ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod openssl-1.0.0a/doc/crypto/DSA_sign.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_sign.pod 2010-09-01 19:36:31.608126088 +0100 @@ -55,7 +55,7 @@ =head1 SEE ALSO @@ -384,8 +415,9 @@ L =head1 HISTORY ---- doc/crypto/engine.pod 2007-11-19 10:18:03.000000000 +0100 -+++ doc/crypto/engine.pod 2010-04-01 00:45:01.049660583 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/engine.pod openssl-1.0.0a/doc/crypto/engine.pod +--- openssl-1.0.0a.orig//doc/crypto/engine.pod 2007-11-19 09:18:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/engine.pod 2010-09-01 19:36:31.620125025 +0100 @@ -594,6 +594,6 @@ =head1 SEE ALSO @@ -394,8 +426,9 @@ +L, L, L, L =cut ---- doc/crypto/ERR_clear_error.pod 2000-02-01 02:36:58.000000000 +0100 -+++ doc/crypto/ERR_clear_error.pod 2010-04-01 00:45:00.857161750 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod openssl-1.0.0a/doc/crypto/ERR_clear_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod 2000-02-01 01:36:58.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_clear_error.pod 2010-09-01 19:36:31.612125737 +0100 @@ -20,7 +20,7 @@ =head1 SEE ALSO @@ -405,8 +438,9 @@ =head1 HISTORY ---- doc/crypto/ERR_error_string.pod 2004-11-14 16:11:37.000000000 +0100 -+++ doc/crypto/ERR_error_string.pod 2010-04-01 00:45:00.863828202 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod openssl-1.0.0a/doc/crypto/ERR_error_string.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod 2004-11-14 15:11:37.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_error_string.pod 2010-09-01 19:36:31.612125737 +0100 @@ -60,7 +60,7 @@ =head1 SEE ALSO @@ -416,8 +450,9 @@ L, L L ---- doc/crypto/ERR_get_error.pod 2002-11-29 15:21:54.000000000 +0100 -+++ doc/crypto/ERR_get_error.pod 2010-04-01 00:45:00.870494614 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod openssl-1.0.0a/doc/crypto/ERR_get_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod 2002-11-29 14:21:54.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_get_error.pod 2010-09-01 19:36:31.612125737 +0100 @@ -61,7 +61,7 @@ =head1 SEE ALSO @@ -427,8 +462,9 @@ L =head1 HISTORY ---- doc/crypto/ERR_GET_LIB.pod 2000-02-01 02:36:58.000000000 +0100 -+++ doc/crypto/ERR_GET_LIB.pod 2010-04-01 00:45:00.850495218 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod 2000-02-01 01:36:58.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod 2010-09-01 19:36:31.612125737 +0100 @@ -41,7 +41,7 @@ =head1 SEE ALSO @@ -438,8 +474,9 @@ =head1 HISTORY ---- doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 12:55:08.000000000 +0100 -+++ doc/crypto/ERR_load_crypto_strings.pod 2010-04-01 00:45:00.873827919 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod 2010-09-01 19:36:31.612125737 +0100 @@ -35,7 +35,7 @@ =head1 SEE ALSO @@ -449,8 +486,9 @@ =head1 HISTORY ---- doc/crypto/ERR_load_strings.pod 2000-02-24 12:55:08.000000000 +0100 -+++ doc/crypto/ERR_load_strings.pod 2010-04-01 00:45:00.876327759 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_strings.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_load_strings.pod 2010-09-01 19:36:31.612125737 +0100 @@ -43,7 +43,7 @@ =head1 SEE ALSO @@ -460,8 +498,9 @@ =head1 HISTORY ---- doc/crypto/err.pod 2002-07-10 21:35:46.000000000 +0200 -+++ doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100 +diff -Naur openssl-1.0.0a.orig//doc/crypto/err.pod openssl-1.0.0a/doc/crypto/err.pod +--- openssl-1.0.0a.orig//doc/crypto/err.pod 2002-07-10 20:35:46.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,187 +0,0 @@ -=pod - @@ -650,8 +689,9 @@ -L - -=cut ---- doc/crypto/ERR_print_errors.pod 2000-02-01 02:36:59.000000000 +0100 -+++ doc/crypto/ERR_print_errors.pod 2010-04-01 00:45:00.879660945 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod openssl-1.0.0a/doc/crypto/ERR_print_errors.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod 2000-02-01 01:36:59.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_print_errors.pod 2010-09-01 19:36:31.612125737 +0100 @@ -38,7 +38,7 @@ =head1 SEE ALSO @@ -661,8 +701,9 @@ L, L, L ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod openssl-1.0.0a/doc/crypto/ERR_put_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_put_error.pod 2010-09-01 19:36:31.612125737 +0100 @@ -34,7 +34,7 @@ =head1 SEE ALSO @@ -672,8 +713,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod openssl-1.0.0a/doc/crypto/ERR_remove_state.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod 2000-05-19 08:54:42.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/ERR_remove_state.pod 2010-09-01 19:36:31.612125737 +0100 @@ -25,7 +25,7 @@ =head1 SEE ALSO @@ -683,8 +725,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod 2004-11-25 17:47:30.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod 2010-09-01 19:36:31.612125737 +0100 @@ -59,7 +59,7 @@ =head1 SEE ALSO @@ -694,8 +737,9 @@ L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod 2000-09-23 08:16:14.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod 2010-09-01 19:36:31.612125737 +0100 @@ -54,7 +54,7 @@ =head1 SEE ALSO @@ -705,8 +749,9 @@ L, L ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod openssl-1.0.0a/doc/crypto/EVP_SealInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod 2005-03-29 18:50:08.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_SealInit.pod 2010-09-01 19:36:31.612125737 +0100 @@ -74,7 +74,7 @@ =head1 SEE ALSO @@ -716,8 +761,9 @@ L, L ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod openssl-1.0.0a/doc/crypto/EVP_SignInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod 2006-07-12 13:31:29.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_SignInit.pod 2010-09-01 19:36:31.616125383 +0100 @@ -89,7 +89,7 @@ =head1 SEE ALSO @@ -727,8 +773,9 @@ L, L, L, L, L, L, L, L ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod 2006-07-12 13:31:30.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod 2010-09-01 19:36:31.616125383 +0100 @@ -80,7 +80,7 @@ L, @@ -738,8 +785,9 @@ L, L, L, L, L, L, L, L ---- 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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod openssl-1.0.0a/doc/crypto/OPENSSL_config.pod +--- openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod 2005-06-03 00:19:56.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/OPENSSL_config.pod 2010-09-01 19:36:31.616125383 +0100 @@ -73,7 +73,7 @@ =head1 SEE ALSO @@ -749,8 +797,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_err.pod openssl-1.0.0a/doc/crypto/openssl_err.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_err.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_err.pod 2010-09-01 19:36:31.624124669 +0100 @@ -0,0 +1,187 @@ +=pod + @@ -939,8 +988,9 @@ +L + +=cut ---- doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100 -+++ doc/crypto/openssl_rand.pod 2010-04-01 00:45:01.059660101 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod openssl-1.0.0a/doc/crypto/openssl_rand.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_rand.pod 2010-09-01 19:36:31.624124669 +0100 @@ -0,0 +1,175 @@ +=pod + @@ -1117,16 +1167,15 @@ +L + +=cut ---- doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100 -+++ doc/crypto/openssl_threads.pod 2009-10-01 01:40:52.000000000 +0200 -@@ -0,0 +1,210 @@ +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod openssl-1.0.0a/doc/crypto/openssl_threads.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_threads.pod 2010-09-01 19:36:31.624124669 +0100 +@@ -0,0 +1,175 @@ +=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_locking_callback, CRYPTO_set_id_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 @@ -1135,26 +1184,14 @@ + + #include + -+ /* 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); ++ void CRYPTO_set_locking_callback(void (*locking_function)(int mode, ++ int n, const char *file, int line)); ++ ++ void CRYPTO_set_id_callback(unsigned long (*id_function)(void)); + + int CRYPTO_num_locks(void); + ++ + /* struct CRYPTO_dynlock_value needs to be defined by the user */ + struct CRYPTO_dynlock_value; + @@ -1186,8 +1223,7 @@ +=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. ++that at least two callback functions are set. + +locking_function(int mode, int n, const char *file, int line) is +needed to perform locking on shared data structures. @@ -1202,42 +1238,10 @@ +B and B 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. The implementation of this callback should not -+fill in B 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. 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 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 ++id_function(void) is a function that returns a thread ID, for example ++pthread_self() if it returns an integer (see NOTES below). It isn't ++needed on Windows nor on platforms where getpid() returns a different ++ID for each thread (see NOTES below). + +Additionally, OpenSSL supports dynamic locks, and sometimes, some parts +of OpenSSL need it for better performance. To enable this, the following @@ -1309,6 +1313,22 @@ +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 shows examples of the callback functions on @@ -1316,22 +1336,19 @@ + +=head1 HISTORY + -+CRYPTO_set_locking_callback() is ++CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are +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 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 + +=cut ---- doc/crypto/RAND_add.pod 2000-03-22 16:30:03.000000000 +0100 -+++ doc/crypto/RAND_add.pod 2010-04-01 00:45:00.939660251 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_add.pod openssl-1.0.0a/doc/crypto/RAND_add.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_add.pod 2000-03-22 15:30:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_add.pod 2010-09-01 19:36:31.616125383 +0100 @@ -65,7 +65,7 @@ =head1 SEE ALSO @@ -1341,8 +1358,9 @@ L, L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod openssl-1.0.0a/doc/crypto/RAND_bytes.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod 2007-09-24 12:01:18.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RAND_bytes.pod 2010-09-01 19:36:31.616125383 +0100 @@ -38,7 +38,7 @@ =head1 SEE ALSO @@ -1352,8 +1370,9 @@ L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod openssl-1.0.0a/doc/crypto/RAND_cleanup.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod 2000-01-27 01:25:06.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_cleanup.pod 2010-09-01 19:36:31.616125383 +0100 @@ -20,7 +20,7 @@ =head1 SEE ALSO @@ -1363,8 +1382,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod openssl-1.0.0a/doc/crypto/RAND_egd.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod 2008-11-10 11:26:44.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_egd.pod 2010-09-01 19:36:31.616125383 +0100 @@ -72,7 +72,7 @@ =head1 SEE ALSO @@ -1374,8 +1394,9 @@ L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod openssl-1.0.0a/doc/crypto/RAND_load_file.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod 2001-03-21 15:25:56.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_load_file.pod 2010-09-01 19:36:31.616125383 +0100 @@ -43,7 +43,7 @@ =head1 SEE ALSO @@ -1385,8 +1406,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/rand.pod openssl-1.0.0a/doc/crypto/rand.pod +--- openssl-1.0.0a.orig//doc/crypto/rand.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/rand.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,175 +0,0 @@ -=pod - @@ -1563,8 +1585,9 @@ -L - -=cut ---- doc/crypto/RAND_set_rand_method.pod 2007-11-19 10:18:03.000000000 +0100 -+++ doc/crypto/RAND_set_rand_method.pod 2010-04-01 00:45:00.982994946 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod 2007-11-19 09:18:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod 2010-09-01 19:36:31.616125383 +0100 @@ -67,7 +67,7 @@ =head1 SEE ALSO @@ -1574,8 +1597,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod 2000-02-24 11:55:10.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod 2010-09-01 19:36:31.616125383 +0100 @@ -34,7 +34,7 @@ =head1 SEE ALSO @@ -1585,8 +1609,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod openssl-1.0.0a/doc/crypto/RSA_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RSA_generate_key.pod 2010-09-01 19:36:31.616125383 +0100 @@ -59,7 +59,7 @@ =head1 SEE ALSO @@ -1596,8 +1621,9 @@ L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/rsa.pod openssl-1.0.0a/doc/crypto/rsa.pod +--- openssl-1.0.0a.orig//doc/crypto/rsa.pod 2002-08-04 22:08:36.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/rsa.pod 2010-09-01 19:36:31.624124669 +0100 @@ -108,7 +108,7 @@ =head1 SEE ALSO @@ -1607,8 +1633,9 @@ L, L, L, L, ---- doc/crypto/RSA_public_encrypt.pod 2004-03-23 22:01:34.000000000 +0100 -+++ doc/crypto/RSA_public_encrypt.pod 2010-04-01 00:45:01.002994781 +0200 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod 2004-03-23 21:01:34.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod 2010-09-01 19:36:31.620125025 +0100 @@ -73,7 +73,7 @@ =head1 SEE ALSO @@ -1618,8 +1645,9 @@ L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2002-09-25 14:33:28.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2010-09-01 19:36:31.620125025 +0100 @@ -48,7 +48,7 @@ =head1 SEE ALSO @@ -1629,8 +1657,9 @@ L =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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/threads.pod openssl-1.0.0a/doc/crypto/threads.pod +--- openssl-1.0.0a.orig//doc/crypto/threads.pod 2009-10-01 00:40:52.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/threads.pod 1970-01-01 01:00:00.000000000 +0100 @@ -1,210 +0,0 @@ -=pod - @@ -1842,8 +1871,9 @@ -L - -=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 +diff -Naur openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod +--- openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod 2006-05-14 12:27:59.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod 2010-09-01 19:36:31.620125025 +0100 @@ -65,7 +65,7 @@ =head1 SEE ALSO @@ -1853,8 +1883,9 @@ =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 +diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod openssl-1.0.0a/doc/ssl/SSL_get_error.pod +--- openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod 2005-03-30 12:50:14.000000000 +0100 ++++ openssl-1.0.0a/doc/ssl/SSL_get_error.pod 2010-09-01 19:36:40.259360162 +0100 @@ -105,7 +105,7 @@ =head1 SEE ALSO @@ -1864,8 +1895,9 @@ =head1 HISTORY ---- doc/ssl/SSL_want.pod 2005-03-30 13:50:14.000000000 +0200 -+++ doc/ssl/SSL_want.pod 2010-04-01 00:45:03.082993225 +0200 +diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_want.pod openssl-1.0.0a/doc/ssl/SSL_want.pod +--- openssl-1.0.0a.orig//doc/ssl/SSL_want.pod 2005-03-30 12:50:14.000000000 +0100 ++++ openssl-1.0.0a/doc/ssl/SSL_want.pod 2010-09-01 19:36:40.259360162 +0100 @@ -72,6 +72,6 @@ =head1 SEE ALSO @@ -1874,11 +1906,12 @@ +L, L, L =cut ---- FAQ 2010-03-29 15:11:53.000000000 +0200 -+++ FAQ 2010-04-01 00:46:00.593821225 +0200 +diff -Naur openssl-1.0.0a.orig//FAQ openssl-1.0.0a/FAQ +--- openssl-1.0.0a.orig//FAQ 2010-06-01 14:31:36.000000000 +0100 ++++ openssl-1.0.0a/FAQ 2010-09-01 19:39:19.677244857 +0100 @@ -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() + including 0.9.8[abc...]. As of version 1.0.0, 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. -- cgit v0.12