summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 0dda539ef..40402a383 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 000000000..d986ae512
--- /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 de20b8191..4d5014695 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