Commit b0afbaf3 authored by Timo Teräs's avatar Timo Teräs Committed by Natanael Copa
Browse files

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 f2ecdc70)
parent 685d8444
......@@ -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;
......
# 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"
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;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment