[Pkg-openssl-changes] r704 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2014-11-06 23:51:57 +0000 (Thu, 06 Nov 2014)
New Revision: 704

Added:
   openssl/trunk/debian/patches/disable_freelist.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
Disable the freelist.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2014-11-06 23:40:56 UTC (rev 703)
+++ openssl/trunk/debian/changelog	2014-11-06 23:51:57 UTC (rev 704)
@@ -20,6 +20,7 @@
     disable SSLv3 and pass the option.  This drops the following functions
     from the library: SSLv3_method, SSLv3_server_method and
     SSLv3_client_method
+  * Build using OPENSSL_NO_BUF_FREELISTS
 
  -- Kurt Roeckx <kurt at roeckx.be>  Fri, 07 Nov 2014 00:20:10 +0100
 

Added: openssl/trunk/debian/patches/disable_freelist.patch
===================================================================
--- openssl/trunk/debian/patches/disable_freelist.patch	                        (rev 0)
+++ openssl/trunk/debian/patches/disable_freelist.patch	2014-11-06 23:51:57 UTC (rev 704)
@@ -0,0 +1,32 @@
+From: Kurt Roeckx <kurt at roeckx.be>
+Subject: Disable the freelist
+
+We don't define OPENSSL_NO_BUF_FREELISTS globally sinc it changes structures and
+would break the ABI.  Instead we just do it in the .c files that try to do
+something with it.
+
+Index: openssl-1.0.2~beta3/ssl/s3_both.c
+===================================================================
+--- openssl-1.0.2~beta3.orig/ssl/s3_both.c
++++ openssl-1.0.2~beta3/ssl/s3_both.c
+@@ -596,6 +596,7 @@ int ssl_verify_alarm_type(long type)
+ 	return(al);
+ 	}
+ 
++#define OPENSSL_NO_BUF_FREELISTS
+ #ifndef OPENSSL_NO_BUF_FREELISTS
+ /* On some platforms, malloc() performance is bad enough that you can't just
+  * free() and malloc() buffers all the time, so we need to use freelists from
+Index: openssl-1.0.2~beta3/ssl/ssl_lib.c
+===================================================================
+--- openssl-1.0.2~beta3.orig/ssl/ssl_lib.c
++++ openssl-1.0.2~beta3/ssl/ssl_lib.c
+@@ -162,6 +162,8 @@
+ 
+ const char *SSL_version_str=OPENSSL_VERSION_TEXT;
+ 
++#define OPENSSL_NO_BUF_FREELISTS
++
+ SSL3_ENC_METHOD ssl3_undef_enc_method={
+ 	/* evil casts, but these functions are only called if there's a library bug */
+ 	(int (*)(SSL *,int))ssl_undefined_function,

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2014-11-06 23:40:56 UTC (rev 703)
+++ openssl/trunk/debian/patches/series	2014-11-06 23:51:57 UTC (rev 704)
@@ -21,3 +21,4 @@
 #padlock_conf.patch
 git_snapshot.patch
 no_ssl3_method.patch
+disable_freelist.patch