summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2010-11-17 15:43:09 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-11-19 14:46:37 (GMT)
commit9df0952493bdea3f28765800055c266ccf7db166 (patch)
treeaba7377b9a1505ec62bf00220e2fbf600e1fba44
parent1d6b9bcf9e70c44d9adb129d439b44f74438ab3e (diff)
downloadbuildroot-9df0952493bdea3f28765800055c266ccf7db166.tar.gz
buildroot-9df0952493bdea3f28765800055c266ccf7db166.tar.bz2
openssl: security bump to version 1.0.0b
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/openssl/openssl-r19998.patch16
-rw-r--r--package/openssl/openssl.mk2
3 files changed, 18 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 0dda539..40402a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@
Updated/fixed packages: bash, bind, busybox, libglib2,
libcurl, libmad, midori, module-init-tools, mtd-utils,
- openssh, pciutils, qt, sqlite, sysstat, webkit
+ openssh, openssl, pciutils, qt, sqlite, sysstat, webkit
Issues resolved (http://bugs.uclibc.org):
diff --git a/package/openssl/openssl-r19998.patch b/package/openssl/openssl-r19998.patch
new file mode 100644
index 0000000..d986ae5
--- /dev/null
+++ b/package/openssl/openssl-r19998.patch
@@ -0,0 +1,16 @@
+Index: openssl/ssl/t1_lib.c
+RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
+rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
+--- t1_lib.c 2010/11/16 13:26:24 1.64.2.15
++++ t1_lib.c 2010/11/16 22:41:07 1.64.2.16
+@@ -779,8 +779,8 @@
+ {
+ if(s->session->tlsext_ecpointformatlist)
+ {
+- *al = TLS1_AD_DECODE_ERROR;
+- return 0;
++ OPENSSL_free(s->session->tlsext_ecpointformatlist);
++ s->session->tlsext_ecpointformatlist = NULL;
+ }
+ s->session->tlsext_ecpointformatlist_length = 0;
+ if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index de20b81..4d50146 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
#
#############################################################
-OPENSSL_VERSION = 1.0.0a
+OPENSSL_VERSION = 1.0.0b
OPENSSL_SITE = http://www.openssl.org/source
OPENSSL_INSTALL_STAGING = YES
OPENSSL_DEPENDENCIES = zlib