summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--package/openssl/openssl-r19998.patch16
-rw-r--r--package/openssl/openssl.mk2
3 files changed, 3 insertions, 19 deletions
diff --git a/CHANGES b/CHANGES
index f0424a77a..c1c4a6f43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,8 @@
Ccache support reworked. Now used for both host and target
compilation, and cache is stored in ~/.buildroot-ccache.
- Updated/fixed packages: busybox, cloop, m4, openssh, qt,
- usbutils, xz
+ Updated/fixed packages: busybox, cloop, m4, openssh, openssl,
+ qt, usbutils, xz
New packages: dhrystone, lsuio, rsh-redone, whetstone
diff --git a/package/openssl/openssl-r19998.patch b/package/openssl/openssl-r19998.patch
deleted file mode 100644
index d986ae512..000000000
--- a/package/openssl/openssl-r19998.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 4d5014695..ff807c93d 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -4,7 +4,7 @@
#
#############################################################
-OPENSSL_VERSION = 1.0.0b
+OPENSSL_VERSION = 1.0.0c
OPENSSL_SITE = http://www.openssl.org/source
OPENSSL_INSTALL_STAGING = YES
OPENSSL_DEPENDENCIES = zlib