pool/openssl
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 211421 from Base:System

Browse Source 
- compression_methods_switch.patch: setenv might not be successful
  if a surrounding library or application filters it, like e.g. sudo.
  As setenv() does not seem to be useful anyway, remove it.
  bnc#849377 (forwarded request 211400 from msmeissn)

OBS-URL: https://build.opensuse.org/request/show/211421
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=103
This commit is contained in:
Stephan Kulow 2013-12-19 12:34:52 +00:00 committed by Git OBS Bridge
parent a4f9e5aa25
commit 17914da9d0
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compression_methods_switch.patch
View File

@ -31,16 +31,21 @@ Index: openssl-1.0.1e/ssl/ssl_ciph.c
===================================================================
--- openssl-1.0.1e.orig/ssl/ssl_ciph.c
+++ openssl-1.0.1e/ssl/ssl_ciph.c
@@ -455,7 +455,11 @@ static void load_builtin_compressions(vo
@@ -452,10 +452,16 @@ static void load_builtin_compressions(vo
if (ssl_comp_methods == NULL)
{
SSL_COMP *comp = NULL;
+ const char *nodefaultzlib;
MemCheck_off();
ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp);
- if (ssl_comp_methods != NULL)
+
+ if( getenv("OPENSSL_NO_DEFAULT_ZLIB") == NULL)
+ setenv("OPENSSL_NO_DEFAULT_ZLIB", "yes", 1);
+
+ if (ssl_comp_methods != NULL && strncmp( getenv("OPENSSL_NO_DEFAULT_ZLIB"), "no", 2) == 0)
+ /* The default is "no" compression to avoid CRIME/BEAST */
+ nodefaultzlib = getenv("OPENSSL_NO_DEFAULT_ZLIB");
+ if ( ssl_comp_methods != NULL &&
+ nodefaultzlib &&
+ strncmp( nodefaultzlib, "no", 2) == 0)
{
comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
if (comp != NULL)

8
openssl.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Dec 17 13:57:40 UTC 2013 - meissner@suse.com
- compression_methods_switch.patch: setenv might not be successful
if a surrounding library or application filters it, like e.g. sudo.
As setenv() does not seem to be useful anyway, remove it.
bnc#849377
-------------------------------------------------------------------
Mon Dec 16 04:28:09 UTC 2013 - shchang@suse.com