diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2010-11-17 12:55:20 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-03 07:13:46 +0000 |
| commit | b0afbaf3f7c43d5f5d374cb91454a30cc7419082 (patch) | |
| tree | f8bd9c5ec4ba7d283ad8d5a4b78169f4056b24d8 | |
| parent | 685d84445c3014c43fcb8267746db3c6f87c6ee3 (diff) | |
| download | aports-b0afbaf3f7c43d5f5d374cb91454a30cc7419082.tar.bz2 aports-b0afbaf3f7c43d5f5d374cb91454a30cc7419082.tar.xz | |
main/openssl: upgrade to 1.0.0b and claim maintainership
* upgrade to 1.0.0b which has security fixes
* update patch which did not apply anymore
* delete patch merged upstream
(cherry picked from commit f2ecdc70a8a521ce1deb1d5ea3273054f77aa076)
| -rw-r--r-- | main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch | 6 | ||||
| -rw-r--r-- | main/openssl/APKBUILD | 14 | ||||
| -rw-r--r-- | main/openssl/cve-2010-2939.patch | 12 |
3 files changed, 9 insertions, 23 deletions
diff --git a/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch b/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch index f12d45a841..d292ad9bc0 100644 --- a/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch +++ b/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch @@ -108,9 +108,9 @@ index 539bfff..f64289e 100644 int MAIN(int, char **); @@ -337,7 +399,6 @@ int MAIN(int argc, char **argv) - #ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; - #endif + + int MAIN(int argc, char **argv) + { - unsigned char *buf=NULL,*buf2=NULL; int mret=1; long count=0,save_count=0; diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 5f5399d718..a33276a3e8 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=openssl -pkgver=1.0.0a -pkgrel=4 +pkgver=1.0.0b +pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="http://openssl.org" depends= @@ -19,7 +19,6 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz 0003-engines-e_padlock-backport-cvs-head-changes.patch 0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch 0005-crypto-engine-autoload-padlock-dynamic-engine.patch - cve-2010-2939.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -68,12 +67,11 @@ libssl() { done } -md5sums="e3873edfffc783624cfbdb65e2249cbd openssl-1.0.0a.tar.gz +md5sums="104deb3b7e6820cae6de3f49ba0ff2b0 openssl-1.0.0b.tar.gz 115c481cd59b3dba631364e8fb1778f5 fix-manpages.patch c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch 1f607b8e11347e56a0906756f3d6928a 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch -5ba830cf1e828192c8c40023dc92917d 0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch +16424fe5fb494804559f01c7ec7e64f4 0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch 53fbd01733b488717575e04a5aaf6664 0003-engines-e_padlock-backport-cvs-head-changes.patch beea8819faeefb9ab19ef90f00c53782 0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch -8bc7a427f6005158585386b9837f700c 0005-crypto-engine-autoload-padlock-dynamic-engine.patch -6fae2ff07483b001249c1944e5e14a1d cve-2010-2939.patch" +8bc7a427f6005158585386b9837f700c 0005-crypto-engine-autoload-padlock-dynamic-engine.patch" diff --git a/main/openssl/cve-2010-2939.patch b/main/openssl/cve-2010-2939.patch deleted file mode 100644 index 29b5f844f2..0000000000 --- a/main/openssl/cve-2010-2939.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/332027 - ---- a/ssl/s3_clnt.c -+++ b/ssl/s3_clnt.c -@@ -1508,6 +1508,7 @@ - s->session->sess_cert->peer_ecdh_tmp=ecdh; - ecdh=NULL; - BN_CTX_free(bn_ctx); -+ bn_ctx = NULL; - EC_POINT_free(srvr_ecpoint); - srvr_ecpoint = NULL; - } |