[packages] stunnel: update to 4.33 (closes: #7296)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@21439 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -1,27 +1,28 @@
|
||||
--- a/src/ssl.c
|
||||
+++ b/src/ssl.c
|
||||
@@ -63,13 +63,16 @@ void ssl_init(void) { /* init SSL before
|
||||
}
|
||||
|
||||
void ssl_configure(void) { /* configure global SSL settings */
|
||||
+#ifndef OPENSSL_NO_COMP
|
||||
if(options.compression!=COMP_NONE)
|
||||
init_compression();
|
||||
@@ -72,14 +72,17 @@ int ssl_configure(void) { /* configure g
|
||||
s_log(LOG_NOTICE, "FIPS mode %s",
|
||||
global_options.option.fips ? "enabled" : "disabled");
|
||||
#endif /* USE_FIPS */
|
||||
+#ifndef OPENSSL_NO_COMP
|
||||
if(global_options.compression!=COMP_NONE && !init_compression())
|
||||
return 0;
|
||||
+#endif
|
||||
if(!init_prng())
|
||||
s_log(LOG_DEBUG, "PRNG seeded successfully");
|
||||
return 0;
|
||||
s_log(LOG_DEBUG, "PRNG seeded successfully");
|
||||
return 1; /* SUCCESS */
|
||||
}
|
||||
|
||||
static void init_compression(void) {
|
||||
+#ifndef OPENSSL_NO_COMP
|
||||
static int init_compression(void) {
|
||||
int id=0;
|
||||
COMP_METHOD *cm=NULL;
|
||||
char *name="unknown";
|
||||
@@ -98,6 +101,7 @@ static void init_compression(void) {
|
||||
die(1);
|
||||
}
|
||||
@@ -111,6 +114,7 @@ static int init_compression(void) {
|
||||
s_log(LOG_INFO, "Compression enabled using %s method", name);
|
||||
+#endif
|
||||
return 1;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int init_prng(void) {
|
||||
int totbytes=0;
|
||||
|
Reference in New Issue
Block a user